gentoo auto-resync : 20:01:2024 - 20:08:51

13 files changed, 67 insertions, 458 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 02c12a02dacb..c0a3d5992787 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 415570fda807..e831e7a60851 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -7,7 +7,7 @@ DIST aws-cli-1.32.21.gh.tar.gz 2627500 BLAKE2B ad90a93eddbea3f8a8d7da003da10ecc1
 DIST aws-cli-1.32.22.gh.tar.gz 2627825 BLAKE2B 1ef00983eb9a0fea5611ac6121c70e5a140135ba4f556787b075394c8073d5162ec79b3f942e9060feaf5e710dd5adc4afbdcee0f6dd25a25b93957f61577a1e SHA512 ec2532a3f59ae755faadf310bd64cdca5318767d1bf491d0e5224747f9d73b363a70a489dad26365666decfea43db29d3eedc5cbd8c018b1747205c5897c8dff
 DIST aws-cli-1.32.23.gh.tar.gz 2627296 BLAKE2B b85f77efb7e7f9fac19fc342bcef44def80de24ec7ce50157fc06b0db6c3e0726c21ffcd13861d11170745d76e15e8f54d4d3ec030b4dea93d882b31a9aa38b2 SHA512 b566af885a980a74e159bd41ec4dbb94af87a5a43f4c07845c98ce60762bf33f2770c46a290f95102819da7266bb59040fbb4c7d92422c32f6e1a0b7bfa6f5cf
 EBUILD awscli-1.32.11.ebuild 2864 BLAKE2B 5bf1ffd344887c79c3e7baf37dfd7a00bac095342f0128d71407661ecd248843c2ec368ab0e7b7be0a7ff2c928faa01fa7c0eaad2163488752862f0cf6cd256c SHA512 eb2788ab3d268538d6a93a35d5f424cdfb6b69f5858c8ec1cbf91a3a7134f40aeabf5514cde51c81842646b795051a6cceebb3c46a14fe32431029aa3451d4ff
-EBUILD awscli-1.32.14.ebuild 2871 BLAKE2B d3d947d0b8fcc7f665d3ae2f1456abf977b123e672a0ba9fa3282affc71e649efc073394b2f2e8023f0c0cf891e37737e62edbeead64c99c46ec7262ad1996fd SHA512 edbc32e9f407a678964dc09b002133a33b07143d07dade702075a0c498faf6563ca77b92e3d4d9d3f9b017d7073ed8237f8c6cd89d2ee3c27033393d2b4b1e3a
+EBUILD awscli-1.32.14.ebuild 2864 BLAKE2B 5bf1ffd344887c79c3e7baf37dfd7a00bac095342f0128d71407661ecd248843c2ec368ab0e7b7be0a7ff2c928faa01fa7c0eaad2163488752862f0cf6cd256c SHA512 eb2788ab3d268538d6a93a35d5f424cdfb6b69f5858c8ec1cbf91a3a7134f40aeabf5514cde51c81842646b795051a6cceebb3c46a14fe32431029aa3451d4ff
 EBUILD awscli-1.32.18.ebuild 2871 BLAKE2B d3d947d0b8fcc7f665d3ae2f1456abf977b123e672a0ba9fa3282affc71e649efc073394b2f2e8023f0c0cf891e37737e62edbeead64c99c46ec7262ad1996fd SHA512 edbc32e9f407a678964dc09b002133a33b07143d07dade702075a0c498faf6563ca77b92e3d4d9d3f9b017d7073ed8237f8c6cd89d2ee3c27033393d2b4b1e3a
 EBUILD awscli-1.32.19.ebuild 2871 BLAKE2B d3d947d0b8fcc7f665d3ae2f1456abf977b123e672a0ba9fa3282affc71e649efc073394b2f2e8023f0c0cf891e37737e62edbeead64c99c46ec7262ad1996fd SHA512 edbc32e9f407a678964dc09b002133a33b07143d07dade702075a0c498faf6563ca77b92e3d4d9d3f9b017d7073ed8237f8c6cd89d2ee3c27033393d2b4b1e3a
 EBUILD awscli-1.32.20.ebuild 2988 BLAKE2B 23cddded64b0ff1c61d8efd6df3a89dd60581110756af8581b76ffd69e7b905f2c3a0f5f53c06b5cc00a042c9125def2bbc839b440a2474c6af0008804d1722c SHA512 e9ffc0a602cacad8e3a75324901340366a4d7545e0644b52d52f45ba7026026c51eb33c63d123d9201e7d63acb6646e298855a15fffa2ba0a1f63c806d2d1cc3
diff --git a/app-admin/awscli/awscli-1.32.14.ebuild b/app-admin/awscli/awscli-1.32.14.ebuild
index 390708df2335..bbe11eaa3e58 100644
--- a/app-admin/awscli/awscli-1.32.14.ebuild
+++ b/app-admin/awscli/awscli-1.32.14.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 # botocore is x.(y+2).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index cb19e55b6e87..24975004e2e2 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -1,7 +1,10 @@
 AUX filebeat.confd 269 BLAKE2B f9cc2a3d96be870d755c41606a274e94d6f6a2a5be71aeb3fc10f989d58b1bb5cc3683b38ede75f7e34937daa4189eccdd30c306b20e219c91bc90ac22d21b40 SHA512 89f2a8ead476750b3fd9a94dcc84311503907e78e66c70d151f27c7fdc8835e7bae6667a6aed0b6470a8f9b42c850396973fd09b1b6aec2d170e3774c8cfddff
 AUX filebeat.initd 1385 BLAKE2B c69021a76aa4c49212edf8612b6e672b9d92365ff77fddb24d5b34b78260ed49214366a7ca9ea58c9ea490d914bfe5c506141f5cf2cb7f02f7f89eafc75e5c32 SHA512 f48fcb51464797eed586619de7f9cbfcab678d2832671b1dbb5717f2ab544391ba7a517269e1fdcdff9d43c1e07e95916302a91f79e7a4b734dd19d5802cba7d
 AUX filebeat.initd.1 1385 BLAKE2B 889ea416c252efa60fd6c7c8fae8937f5064455bb6289e1fa6127ddd1535387dbdfe9a91afb091745a7d0e5cd058e2296a5d270e52494595ee0e72111500fd64 SHA512 d34bcc9d2e032ebc79f0ff1272974ba4346bdd7a32c24c005eaa3b2a8dde6767fd88460b7b79f2f0b98a624f371f2b3a5483ef92909da4b21e4f0967ddcd86c8
+DIST filebeat-7.17.16-deps.tar.xz 633004812 BLAKE2B c10790fc07e6fcc583f88944a4d114cb712f8c27e27006d11bdbea5dfe2e36b504f767034c0b033af4363b44e3c38c92f6a490b4a65303d5aee49ebfe76c9f29 SHA512 91ed7b7e55d6659b52ce89756e49364595322e8486c3b9f13199f98871909d88c4fd0515e3867af43173b1b966965c992cc48c71de026a7e2a401a515092809f
+DIST filebeat-7.17.16.tar.gz 101629004 BLAKE2B c67eed28574948022673737dba4d39409c23f5b4b94f3a9935090acd7a1c34d9302b35b42f6ab6e58cdf25a2dd948adbefc145f1075cd574e8196af000cf129c SHA512 db52d802f0f253e714a6e26436bbec82bfcf74f38d8f2a8f862a9318375b020676d3980a4b20f468ced0215de1eb0a009915a33a61652fe11de8098cd8542bfe
 DIST filebeat-7.17.5-deps.tar.xz 548163248 BLAKE2B 720a91b3e5a2fe16394ef3502f133837bd64d326bda6fadc066ae6517d9682a82614c6c699f9edacbe6d987ef326542bbf875a4063e2a4513ea296259f9b2445 SHA512 3b3cc39bdd966998a5b7867e60d390a539e1dd80ec7b8d68e3b0b9c1aab9eecca3810d1e989c74f15c20385a7c9a41e820129e28d33c2e47c2ba90d5e236a077
 DIST filebeat-7.17.5.tar.gz 101518610 BLAKE2B 4736a097e82741981841b78b18947b47fef32a50d6f6b498b4377f2e9ffedc79196b9ea0d70398a9830864f36520538ee868fcdf6081ea5b157e69aabe316ab9 SHA512 c82bc5c85492b6fe85b172d52d3faf4a6a2e8d8ec3f1964549beea6eda5a5e76ad0c55e084ad42ce429d0caac18fc7f0da769b9242c7959558800e0e3de7e14b
+EBUILD filebeat-7.17.16.ebuild 1341 BLAKE2B 3770998334fc8e25ea69e325579b16bb52b04380108c388ff1081abce1622513a3aa19360c8bad5796e1f546fb0b12d7c63697dc8fa980f6d796ec3173d17b4d SHA512 5d12a2ec7bedcee7cfe30618d638b0500a29044866d7fd75601d8ca52c24c2e06e32200207f22f960ec1dae1d4ba4eadc5d1b806a920903f1d0a3b013f3ac3de
 EBUILD filebeat-7.17.5.ebuild 1359 BLAKE2B 064a4a0407e5f899584137d6aa5eb7a3d31dc4b268384801c6c71abbadd621d96c7e1fed6a474417e7bd7e808dcace34357bdb9acf819d05dcea9a1496f18806 SHA512 19ec33820cdbd6ad0b50efbc35bf6909a003fcc51f6aef79267499947f0c8486959a56c8f5ad23529941176384b915f5dee8f9aeee494193a0bc3c480a7d8a2a
 MISC metadata.xml 492 BLAKE2B 6b16876306316f37d59bf32aac33a2ff918c63dbf2ca0f71448249b20e99e5576f20dbad997a227730cb836c7f244ea8301dae62603e1961127bd755ab87f5b0 SHA512 c42a8bc75fd53383ea094d5049ba5f294cb8a2f0b0fe435eb74427bc82751bfbe4e4bfe076abbd052946ae6b0cf2f7129040a47b439a704629c6846ce6b7fdec
diff --git a/app-admin/filebeat/filebeat-7.17.16.ebuild b/app-admin/filebeat/filebeat-7.17.16.ebuild
new file mode 100644
index 000000000000..26d8f23ed3de
--- /dev/null
+++ b/app-admin/filebeat/filebeat-7.17.16.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Lightweight log shipper for Logstash and Elasticsearch"
+HOMEPAGE="https://www.elastic.co/products/beats"
+SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/hydrapolic/gentoo-dist-filebeat/releases/download/${PV}/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+S="${WORKDIR}/beats-${PV}"
+
+src_prepare() {
+	default
+
+	# avoid Elastic license
+	rm -r x-pack || die
+
+	# use ${PV} instead of git commit id
+	sed -i "s/\(COMMIT_ID=\).*/\1${PV}/g" "${S}/libbeat/scripts/Makefile" || die
+}
+
+src_compile() {
+	emake -C "${S}/filebeat"
+}
+
+src_install() {
+	keepdir /etc/${PN}
+	keepdir /var/{lib,log}/${PN}
+
+	fperms 0750 /var/{lib,log}/${PN}
+
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd.1" ${PN}
+
+	docinto examples
+	dodoc ${PN}/{filebeat.yml,filebeat.reference.yml}
+
+	dobin filebeat/filebeat
+}
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		elog "Please read the migration guide at:"
+		elog "https://www.elastic.co/guide/en/beats/libbeat/$(ver_cut 1-2)/upgrading.html"
+		elog ""
+	fi
+
+	elog "Example configurations:"
+	elog "${EROOT}/usr/share/doc/${PF}/examples"
+}
diff --git a/app-admin/fluentd/Manifest b/app-admin/fluentd/Manifest
index d345c005a829..195eae915c69 100644
--- a/app-admin/fluentd/Manifest
+++ b/app-admin/fluentd/Manifest
@@ -1,11 +1,6 @@
-AUX fluent.conf 2728 BLAKE2B 1986af0d4062e7d85590e044d47ec77e3a46d9d4e8e79e42a30db05f0c5b730ebdef3f5f233bf929ec05311e644ade0fa89144323fe5ed8a8089dea8e3c5b103 SHA512 b400910c76fe2286e7887643471a55dfbad4aceb8dce07fba33d34923dcc13a609b909394bab50d509719d76a231a77441431e2d6dad75dd62b69ad05a5a804e
 AUX fluentd.confd 85 BLAKE2B 742ae368e0a8dd99f2f697c9438fc0ae4814693ee547be39b3bd8c9956fcb9acd5b6cffcf2a033e987b9a6eb7557a628f360fdd3f0053d055faeb62cad3f1d6a SHA512 9774f8fb0c9db7a501011558ac0c6222bed42501be90ac1c70ae0333cb3dd5ee5bc38417cd5ec3d1e0d8769d7f90bcc230746aed3fd30f28ea643c97d54d1f09
 AUX fluentd.initd 400 BLAKE2B 7c073341f652e393b3ffc8d1fc2bc54b72edc912dc9175263b4b1313e052016454cf5831747539222d6b06b6c28bff8056d3cd9d9d7047ae8e6f771b08e98b7b SHA512 6ca68c87adc6377b6fbfcc14329747b3b2e8c29c2edb842513122ff1f1cbaccd59e35f08aacb092acf115942a24b44d96fe524618c289d3885dbcf708be4f4ac
 AUX fluentd.logrotate 191 BLAKE2B da3f35ab90d627f35aba5a1b5e51ec54d649c725bb50ca2e5cc66561c94bedb2eaa83e6489051dbf2c1ea209fe35f0b77be1228f1b8e46d61aa00775e65abfbd SHA512 f74c0ef04f479adb7c11074ddd803c2574fadb7ce90022f3efc28c1d44d0b77b1483c7bb217652decf22f879a69c7ba1ee7bdc78e5b153762a4f535ea5faa404
-DIST fluentd-1.14.4.gem 852480 BLAKE2B d358a067dbfd50164583e629133632039543560104ba5c2b71fb44e3eba0d4119e73556a64f20f60d1c4d67c9c430fa4ab9e3c37e6d0cba166de9396a9dc339b SHA512 09770d0a02e1a29cc0504cd384365fff9445ba5257950b7154f7ba939dbaefcc6b9b1441838cb89d4ddb3101f1715c271de27e1cf46aac430daf968ce145fbe0
-DIST fluentd-1.14.6.gem 856576 BLAKE2B 1422ab704a4b5eb674885a192ae241aa9ee4ba187ff38c9548435c858712f40b6af028776a8e8c8cd122501463cc910e034b5f0a5815e738f7cfd4d1f0d6026e SHA512 63a4e4a51dd9913d0a3a2ea9cb40794de874ee40256890ebaaef3111cc5a401179abdea1230efc92d962811c2f618591bbc7d8d5139d8851d682818712ba3ea7
 DIST fluentd-1.16.3.gem 880128 BLAKE2B c3b7379acf671bdf339cf4e7f2cc83aafebf4b8146203b04dcf7e1608263734979a77f3514373d9ff5740b421daa51edc3f10ab2b112b61cfac6aae4375efa55 SHA512 fb7d5fc9bd020ae4cd5c45d89740ed9a218156e9f64c170c9c6869448d111755a8e225c3539b8b2626a312406a329b5660d5d9ba2aa863eb1ee8ab69fb9c72a0
-EBUILD fluentd-1.14.4.ebuild 1491 BLAKE2B 8bac4a13d5cafff0190dc6cde8d281035ada9015b742030ef270ff5264785bc2f7000dd4f16254c9798c0a9a5c2d8f6c585f1dbc86f99c4b2c7c65076fe58c01 SHA512 2a841aa5c4a7e83aa49f7c7f70ba9c89a3bb156a9ad31423fb6ced64335dcebcc1e6c8ef32a49c641ada21fedc43baea02afddfd16ec5d1d770025c16171c7ff
-EBUILD fluentd-1.14.6.ebuild 1494 BLAKE2B 7327857a955e818b3f54e9410ac679ce08248828bba15ae1b11344a639aebd4132644d62c5be2554bf8ab0149d8fca2ac802a753183ba17f0b88c9b498e5dec7 SHA512 8526ec009bdb60f58d9e0fee291ad3ed552572ccdc82639001263a6fe1f7f637cf044721a6f03d94e8bd1e0eda32bdae2a255c933e52cd56829addc35d73b68e
 EBUILD fluentd-1.16.3.ebuild 1587 BLAKE2B da491362f4d6d1d13c0c43f1766f63c518cd376454086b8af3644a530049e67568433bc50c32ca19ef67fbec07f9888c8d2754812878185a9e0083439b11ed37 SHA512 b88a39d4cce71a700904c8464cb503057f5b0b71e98a0d6f7489386f604ef07324c645762a4d3767590c2142b9694c352ff6b7126e5f59f13fcbe5818e4521f4
 MISC metadata.xml 585 BLAKE2B 4c37de4344c9dc613c85ef3e238783d3687724405c54d20e669452398a45b05434ae081f228a8b0f31329a006175273a05710538f0d8564c8112f390970d68e1 SHA512 0e73d26f9c495c8336cbb08303a3fa38883c07473f69b16e446f41f398fceff066e9d42510f885665247a8d95c0d3b88d40a099411d4b76765d36a85cdcc0b87
diff --git a/app-admin/fluentd/files/fluent.conf b/app-admin/fluentd/files/fluent.conf
deleted file mode 100644
index 099d1b4af47d..000000000000
--- a/app-admin/fluentd/files/fluent.conf
+++ /dev/null
@@ -1,139 +0,0 @@
-# In v1 configuration, type and id are @ prefix parameters.
-# @type and @id are recommended. type and id are still available for backward compatibility
-
-## built-in TCP input
-## $ echo <json> | fluent-cat <tag>
-#<source>
-#  @type forward
-#  @id forward_input
-#</source>
-
-## built-in UNIX socket input
-#<source>
-#  @type unix
-#</source>
-
-# HTTP input
-# http://localhost:8888/<tag>?json=<json>
-#<source>
-#  @type http
-#  @id http_input
-
-#  port 8888
-#</source>
-
-## File input
-## read apache logs with tag=apache.access
-#<source>
-#  @type tail
-#  format apache
-#  path /var/log/httpd-access.log
-#  tag apache.access
-#</source>
-
-## Mutating event filter
-## Add hostname and tag fields to apache.access tag events
-#<filter apache.access>
-#  @type record_transformer
-#  <record>
-#    hostname ${hostname}
-#    tag ${tag}
-#  </record>
-#</filter>
-
-## Selecting event filter
-## Remove unnecessary events from apache prefixed tag events
-#<filter apache.**>
-#  @type grep
-#  include1 method GET # pass only GET in 'method' field
-#  exclude1 message debug # remove debug event
-#</filter>
-
-# Listen HTTP for monitoring
-# http://localhost:24220/api/plugins
-# http://localhost:24220/api/plugins?type=TYPE
-# http://localhost:24220/api/plugins?tag=MYTAG
-#<source>
-#  @type monitor_agent
-#  @id monitor_agent_input
-
-#  port 24220
-#</source>
-
-# Listen DRb for debug
-#<source>
-#  @type debug_agent
-#  @id debug_agent_input
-
-#  bind 127.0.0.1
-#  port 24230
-#</source>
-
-## match tag=apache.access and write to file
-#<match apache.access>
-#  @type file
-#  path /var/log/fluent/access
-#</match>
-
-## match tag=debug.** and dump to console
-<match debug.**>
-  @type stdout
-  @id stdout_output
-</match>
-
-# match tag=system.** and forward to another fluent server
-#<match system.**>
-#  @type forward
-#  @id forward_output
-
-#  <server>
-#    host 192.168.0.11
-#  </server>
-#  <secondary>
-#    <server>
-#      host 192.168.0.12
-#    </server>
-#  </secondary>
-#</match>
-
-## match tag=myapp.** and forward and write to file
-#<match myapp.**>
-#  @type copy
-#  <store>
-#    @type forward
-#    buffer_type file
-#    buffer_path /var/log/fluent/myapp-forward
-#    retry_limit 50
-#    flush_interval 10s
-#    <server>
-#      host 192.168.0.13
-#    </server>
-#  </store>
-#  <store>
-#    @type file
-#    path /var/log/fluent/myapp
-#  </store>
-#</match>
-
-## match fluent's internal events
-#<match fluent.**>
-#  @type null
-#</match>
-
-## match not matched logs and write to file
-#<match **>
-#  @type file
-#  path /var/log/fluent/else
-#  compress gz
-#</match>
-
-## Label: For handling complex event routing
-#<label @STAGING>
-#  <match system.**>
-#    @type forward
-#    @id staging_forward_output
-#    <server>
-#      host 192.168.0.101
-#    </server>
-#  </match>
-#</label>
diff --git a/app-admin/fluentd/fluentd-1.14.4.ebuild b/app-admin/fluentd/fluentd-1.14.4.ebuild
deleted file mode 100644
index bce8cd6013be..000000000000
--- a/app-admin/fluentd/fluentd-1.14.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby27 ruby30 ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="data collector and unified logging layer (project under CNCF)"
-HOMEPAGE="https://www.fluentd.org"
-
-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
-	>=dev-ruby/msgpack-1.3.1
-	>=dev-ruby/serverengine-2.0.4
-	>=dev-ruby/sigdump-0.2.2
-	>=dev-ruby/strptime-0.2.2
-	>=dev-ruby/tzinfo-1.0
-	>=dev-ruby/yajl-ruby-1.0"
-
-ruby_add_depend "test? ( dev-ruby/flexmock )"
-
-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
-}
diff --git a/app-admin/fluentd/fluentd-1.14.6.ebuild b/app-admin/fluentd/fluentd-1.14.6.ebuild
deleted file mode 100644
index 7d47ce990b7d..000000000000
--- a/app-admin/fluentd/fluentd-1.14.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32"
-
-inherit ruby-fakegem
-
-DESCRIPTION="data collector and unified logging layer (project under CNCF)"
-HOMEPAGE="https://www.fluentd.org"
-
-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/bundler
-	>=dev-ruby/coolio-1.4.5
-	>=dev-ruby/http_parser_rb-0.5.1
-	>=dev-ruby/msgpack-1.3.1
-	>=dev-ruby/serverengine-2.2.5
-	>=dev-ruby/sigdump-0.2.2
-	>=dev-ruby/strptime-0.2.4
-	>=dev-ruby/tzinfo-1.0
-	=dev-ruby/webrick-1.7*
-	>=dev-ruby/yajl-ruby-1.0"
-
-ruby_add_depend "test? ( dev-ruby/flexmock )"
-
-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
-}
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index c46267915dfd..7caaca713903 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,13 +3,7 @@ AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
 AUX logstash.initd-r2 1997 BLAKE2B 4a2e36bcd171950ddea636f9269708416536b4f54c620b36eca91839b894f0b4242775ec85aadbe93714b8aa7cd535774cd0558f4bc90096638d0640e4f3961f SHA512 23203f99610d1666247ee8584b1d1452216f65c6c06345007768eac494c9de755a79bd74b3fd241e62f2239d52394626a61e06100486f89b7f3a2b8282389d56
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-7.17.10-linux-x86_64.tar.gz 364617045 BLAKE2B da08d74aa970525d232221f78695817d479a2b3ad1422f46f3a4e54473991aa6ff63d5e7cbd4aaf885c3d187abfd096ddfac8d2fd8a4c692d29eb1c1cb516d1a SHA512 5391bfef09c403a365518a3a8e8f075bb7974b137095b3c7fd2a0173cfa6dbd4a7451170a3657afef3e6a468e90a38d6e7a5b669799878f9389fa44ff8fee026
-DIST logstash-7.17.12-linux-x86_64.tar.gz 363841975 BLAKE2B eff842a58d4d970bf8eae286c581d9ee0e331db9789e7c3f41ddba9cc639772f3e894924612cdb66eb7042248fc1dfeb3ddd5738cb85c1da9478a578bf291c83 SHA512 4395a9a2c577456bab9269f0e7b451c329cfb6f6f3e69c85315f670665ba16b4ef174f7d788c262511077c29e92c26dc06a86550b233764794ffc6ca1a058118
-DIST logstash-7.17.9-linux-x86_64.tar.gz 364476389 BLAKE2B b02e52e0a9e9a8b7d6b7487333417a95363316dab8530c180b8a42e63f35a20628d9830cd596a6a960d6cb67603dd1f1bfc293ba2705a4683824aafafd8acbc6 SHA512 a43d592e70f023a594f31a3fba365a9cca6611599bd61f998cb1fc38ddd177d459bce23eaf54f811fe0a87a47cdd4bf4b4d4c8008dab1ac03173371f63b91b6c
-DIST logstash-oss-7.17.10-linux-x86_64.tar.gz 364424431 BLAKE2B 24553974cd0762424dce27ae1cefc44173e7786d32ce2973f07ec3acf8fd5632e36e36f3f0170f2b1ff8df0f716b9de835df55af800ef639afdba29f47b988bb SHA512 ba22c4c414f47515387bb28cc47612bea58aff97c407f2571863e83174a2bef273627f65dd531ed833e40668c79144a501d49c3ec691c1b1c4d8fb0cb124b052
-DIST logstash-oss-7.17.12-linux-x86_64.tar.gz 363645002 BLAKE2B 2ee159118a07685499bff7cad10aeba39991d65797ce45e75ed733e3aafa45913b0504ec97d28d2353643150606fae36e5e9c380eefd06eb0357e90beb716e33 SHA512 da20df2765a15eef81976dc3778a7561660fad04156b4ebc197581f94234934b3f4b20aec2e39eab3af9c8694b1a3e36a429170852c238451e0dbb24ea9dfd2a
-DIST logstash-oss-7.17.9-linux-x86_64.tar.gz 364275206 BLAKE2B 06befbe70974ebe740caad79527b92d78d034de37461bf1883862463fe6b063d7a3759729a6191277c2c5724faaccec315c77c77ac384858f34a9594d400abfa SHA512 7c3f9867853582e5d06b9f895b4740abf56a9b6ce34dfbfb624cf9a4b956f489145cd13f3194a7fb16efc52410f55e797c269dc2957a35bdebf9e1aaa3547eaa
-EBUILD logstash-bin-7.17.10.ebuild 2532 BLAKE2B 37fd25d286bcf9f3f95521ea72dd07c5407946c91643fb2e748d2a79e74f31dd28a18f4263fc44da91937fb3d47da857cd55a7f709a3950ebc3bed35003e6d90 SHA512 b4230597a20002df6e1a49135921ef73de1c24325b51806f4f2f6795b697962607a8635c8d05f6e95960fd0152d596a056f01ff31dc65f54b5a0d1ef9a57de2f
-EBUILD logstash-bin-7.17.12.ebuild 2532 BLAKE2B 37fd25d286bcf9f3f95521ea72dd07c5407946c91643fb2e748d2a79e74f31dd28a18f4263fc44da91937fb3d47da857cd55a7f709a3950ebc3bed35003e6d90 SHA512 b4230597a20002df6e1a49135921ef73de1c24325b51806f4f2f6795b697962607a8635c8d05f6e95960fd0152d596a056f01ff31dc65f54b5a0d1ef9a57de2f
-EBUILD logstash-bin-7.17.9.ebuild 2532 BLAKE2B 37fd25d286bcf9f3f95521ea72dd07c5407946c91643fb2e748d2a79e74f31dd28a18f4263fc44da91937fb3d47da857cd55a7f709a3950ebc3bed35003e6d90 SHA512 b4230597a20002df6e1a49135921ef73de1c24325b51806f4f2f6795b697962607a8635c8d05f6e95960fd0152d596a056f01ff31dc65f54b5a0d1ef9a57de2f
+DIST logstash-7.17.16-linux-x86_64.tar.gz 364241317 BLAKE2B 1abb5d3cb4c47596b2df44ca177d9352f53c3b1497e2218f8c483c5298646754c1bf934fc262796eb72fbfc79adde8ba6fadd2b7cc46ff7b11d72f1f52a2bd62 SHA512 cded2127150708de766cec54b39ba90e3eb8b48139f0fd814e8c3691a0a8e87ade46217dadf4d3ccd90daff842984804fbfa056e0484b8e40bcfee86dfbdd10d
+DIST logstash-oss-7.17.16-linux-x86_64.tar.gz 364037570 BLAKE2B 112d8138213c366704676c29ffaeb7af3090953fd42d3652751ef5b5d94d79338fafd119741d913a0eb6308714f896392385938d0595ea08cf681630213ece3b SHA512 382f60c7bea4f9131d8ea70392b24235b3d84906a67b275d6983315080747e85710a6a3a52f6dd7306465d12cf3e7f798a7f2b60e0a3bcfa01926ba9890c3dc5
+EBUILD logstash-bin-7.17.16.ebuild 2532 BLAKE2B e4e62d67ed4fe4da1c230aea3697911b9cdab54030ec71ec18890ffc0193610091f8a66ec63e14f0dc065cace960114ad1f9a38fad64dece6c5b469f0589f74e SHA512 a3a6686f4e1330b95cb06bbcb7e31df349136d5b940294ddc759b18755877f13f721c019c920ed53982f0775c3849c811165196fdda9aa622ba29c42087228b7
 MISC metadata.xml 571 BLAKE2B 8fb52685ec095fe2a192d477c7e5737be2ab526fe5ee9c77f62c8aa1799dea7c471eb3ea073352b2d09e3f1ba82b0dea05dd03648eb810e32504a2707342832e SHA512 36de48dec06abe08515d48f2e2fb86e5125ab6e9331f989dea8fff9d2511b337afffc75a842bf85b051fbe968b220676a4610c0a4d1a6b2c3b83759f9c2ca199
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.10.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.10.ebuild
deleted file mode 100644
index 684ea639d771..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.17.10.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	local d
-	for d in aarch64-FreeBSD aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
-		i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
-		ppc-AIX s390x-Linux sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
-		x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
-			rm -r vendor/jruby/lib/jni/$d || die
-	done
-
-	# remove bundled java
-	rm -r jdk || die
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.12.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.16.ebuild
index 684ea639d771..3fd750a91df6 100644
--- a/app-admin/logstash-bin/logstash-bin-7.17.12.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.17.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild
deleted file mode 100644
index 684ea639d771..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN="${PN%-bin}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tool for managing events and logs"
-HOMEPAGE="https://www.elastic.co/products/logstash"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RESTRICT="strip"
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
-
-RDEPEND="acct-group/logstash
-	acct-user/logstash
-	virtual/jre"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	local d
-	for d in aarch64-FreeBSD aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
-		i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
-		ppc-AIX s390x-Linux sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
-		x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do
-			rm -r vendor/jruby/lib/jni/$d || die
-	done
-
-	# remove bundled java
-	rm -r jdk || die
-}
-
-src_install() {
-	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
-	keepdir "/var/log/${MY_PN}"
-
-	insinto "/usr/share/${MY_PN}"
-	newins "${FILESDIR}/agent.conf.sample" agent.conf
-
-	rm -v config/{pipelines.yml,startup.options} || die
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	doins "${FILESDIR}/pipelines.yml"
-	rm -rv config data || die
-
-	insinto "/opt/${MY_PN}"
-	doins -r .
-	fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
-
-	newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
-
-	insinto /usr/share/eselect/modules
-	doins "${FILESDIR}"/logstash-plugin.eselect
-}
-
-pkg_postinst() {
-	ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
-	ewarn "Install the plugins via eselect module that will automatically re-install"
-	ewarn "all self installed plugins after Logstash upgrades."
-	elog
-	elog "Installing plugins:"
-	elog "eselect logstash-plugin install logstash-output-gelf"
-	elog
-
-	elog "Reinstalling self installed plugins (installed via eselect module):"
-	eselect logstash-plugin reinstall
-
-	elog
-	elog "Sample configuration:"
-	elog "${EROOT}/usr/share/${MY_PN}"
-	elog
-	elog "The default pipeline configuration expects the configuration(s) to be found in:"
-	elog "${EROOT}/etc/logstash/conf.d/*.conf"
-}