gentoo resync : 22.12.2021

6 files changed, 8 insertions, 266 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 71c6635c85b7..cda95afab500 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,19 +3,10 @@ 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-6.8.17.tar.gz 179116623 BLAKE2B fa25a3149fded215586d97b3bd2a2b2b168292d45e32f1b69987c9e6e9e6f35100643df09d03f51da042b27acfd57bfcfdb1f4f18fddf7b9d21e01ef84668cc7 SHA512 00cf51cbce906d2594b0a17548d362fe678f458a2e7f9c167d4387953a848a588dbba070d370002a5e4d7ca2df2e3910805a27e3c0263ab29d99042229af0c3a
-DIST logstash-6.8.19.tar.gz 179116787 BLAKE2B 156c915e4932acd1668b811f0c39c51870faa1ad462b6059a89e4f085af7e8aeaebcb458d65dec5fbc925ba49293db662af1fcb62f3a3b02eabe7756f6f193ab SHA512 19648c9f5f4ae2d222157d45a639f8e6740cd96610fa44a3374c036944b2dba8582f69909ece3e6b0cefe2f340cdc3094bb4b6daace2e564935cad4f8a4f4b19
-DIST logstash-7.13.4-linux-x86_64.tar.gz 361126551 BLAKE2B e972b2c6b992573f0320de0487141c17fa6cd1889d7d266f79958fbc261a4e8564b9f9fc88b654de7e476c6c2747f47e169d0fd3601888035193a2cb844fd710 SHA512 2dba64af5f6b0724a75a8f4f3dc9fb067e27785fd5d0b9ef0571c77df6ebaa89418a165b7489ad47676847c4a9f928cbfc8d3ddc885db21053d0bda9dd524f49
-DIST logstash-7.15.0-linux-x86_64.tar.gz 368280150 BLAKE2B 6e98096782ba4b36428b72e6f48007ccb6db05ac5032475267ebd1564dac1c136a059b42330f85efc8a758372fe0851b6c0d676f4062e01fe2c0d8f6c010de70 SHA512 50503eeea1ebed2540fac23429962f945e66fd8e1c260b6f4d3a80b220d83f2799d703b5d7778c6c80aed90c9e36cd777a580d63c80ab78dd440e26ff2e8b7ac
-DIST logstash-7.15.1-linux-x86_64.tar.gz 368944379 BLAKE2B d86805a04eb49ced9fa0c408e14a61f5e772782cc99445cf9fa36bef7698747d3085dd0834edec2e759f14e1952edcc3b6c7a5cf9a6c065b17561850a5a17be3 SHA512 46ece477e4cf662f2583a25e79014b6f4550e4ad34cd8ef4ec5ad951eac15068bacfe2e21c6f205ea2c3f1b201b06b6541a5d11fdc8be907bf44f214924d4e96
-DIST logstash-oss-6.8.17.tar.gz 178986613 BLAKE2B 5e318903fb134f6096fb983d3651d5d81c2bc9d62421aa7468ee7cb82a5e7895a517911a759d82f1f2c939c3ce67df4e26c1296c0871cb1cfb8078627e68e5f3 SHA512 0f43f9f0dc4a253c6d5a6f07234a22bc67b8866dd6f25837372c1d3c9cca2ddb1b94b632c4528324eeb23019d5d1ae7374661dec8011e55210555e01bec77c2c
-DIST logstash-oss-6.8.19.tar.gz 178986302 BLAKE2B 54ff9be5f26f5e1aaf69403a05ec15358951f5ff4676ba1dc22d995c59071554ef542100400712238c01924a07de5777cda13b0cb84f8d19f1b953405eaab82e SHA512 2f7a2b187c418ba85fff5c86ff12379bc0a8ae0fe098f713c6d5c5339b6aec19589382e0817f6bf495c253f13f489eecb9161daa9102b366ef32073def4e75cf
-DIST logstash-oss-7.13.4-linux-x86_64.tar.gz 360925283 BLAKE2B 68482538d4b2589044215495ab7d41b4820650908d979438b197c5ee4ff82dfc53580fba7c834c62964e9b12ff23e6d9ecfc6e333a2cb6f077d6d4c953527173 SHA512 d57c30c763ba3323380c7276a49895ce3adbe90700061bdf1ce8c6abe98c4ac0c5789ac2a725f15d8d4f89c80dec691479027887b8976dcd618aa91f7af13d8e
-DIST logstash-oss-7.15.0-linux-x86_64.tar.gz 368079309 BLAKE2B 8f21ad0572b93ea7711fc4e721afcb067a629798b72325bff5642b3406e432da5ad6c0b4515ea6e4fa1e2412fdaae464f97bebc1531c61b30abfa8f8ddbb27b8 SHA512 648d83444cdf4997175eb48833cb4ddad09876fd65f6a01bc6ad2d983eb109707885a08250191b066f9d3775247774e09ecdbb7bcac2f7c22c6f1901f0648ba8
-DIST logstash-oss-7.15.1-linux-x86_64.tar.gz 368751151 BLAKE2B 6cf6c3f3ca77f3d04f88aeb6497db5d11043352d0ecf773269cc64095ce1af6c25ed8e9e260beef10a95cb4482466a911ebecdda842015bd036962947fd34087 SHA512 26ab0e5ee21b37b7e21b0ccff0a72f1f2a96ea97c16fb22a2566c4b9100b0eb6d093efc2b7f0ead81db63c180f6b530cf337566a53f298b4051321426dc8d649
-EBUILD logstash-bin-6.8.17.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
-EBUILD logstash-bin-6.8.19.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
-EBUILD logstash-bin-7.13.4.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
-EBUILD logstash-bin-7.15.0.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
-EBUILD logstash-bin-7.15.1.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
+DIST logstash-6.8.22.tar.gz 178580688 BLAKE2B f75b00b93532ee680623abdd63e05bf6453e09850863a71d8c7ea71505f172b3151a258d2f08846cc3866fe38aa8da27dfdac2fa2ebb218862711f08efa46365 SHA512 f9f32f5a769c1d9fb46e453d758539f4bb3256cf3891f626dd8613d4673e244bfe90299208f3086b02d388825c73331764f9e95914563fb0b8bf7b7963d5ecfd
+DIST logstash-7.16.2-linux-x86_64.tar.gz 365618045 BLAKE2B ccbdc8c61dd6d2a95971a8a11eb4c92b2388214a34a7b6024fdad03676308b0bab030287f5db3132c47caff53f82259ba2422cd72ef77c358020d1866278bd32 SHA512 1ff7077735167e328766bb710e4a22e139a713ef940946e454cd21ebe61b5e50af042c0da1baac6eafba973e96f596b80a0342e9dc26beecd3740e6e37e6c981
+DIST logstash-oss-6.8.22.tar.gz 178446837 BLAKE2B c17bb3c2e2e0e8fd131edbc96516c1739aac9230f75b4473fb1f57020792b4def1caed901391b7762766fa0273a0b3f66153070213ba92e96713d0444f17da73 SHA512 12f51a49fa6d5f3b4f997759beaaf836cb5b792626ab96493f039f2a9018441f246af8ea2d4c344190714b66eb1955b629b403c5cc7aafec4f9abbd6f1ac89fa
+DIST logstash-oss-7.16.2-linux-x86_64.tar.gz 365422510 BLAKE2B 89a9ea82d6eb028e4dea18f19453671a138d26507c0dd3409f8113d48de4bcf2bb93f11cc7f1d4e85596cc5ba5e3219d2abe1a9ef55c753e0cc13f6cefa3d2f5 SHA512 b87925bd62387bfcf9e06efedb6e18daf15d221a81f60ed16a837e3c2673948b1c835703675ece7101f9da03ae202f55d2e1859a9fd67d420d824ef69bd1bb1a
+EBUILD logstash-bin-6.8.22.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
+EBUILD logstash-bin-7.16.2.ebuild 2532 BLAKE2B 1f8af6b96d4cf5aa5f9eb74473bdd16c0f67f5a4f64fea0015af8e90f6f1711e6bba2a90581427774d62ade3696b9fb088a953eb82de98cfa2eebb1ee90167e3 SHA512 f63945afafd90a0db59944cba6dd1e87112b06a830c59ba5721dd551c0f0d3a4e3f4ce9e56936aec3636a2635c4ff63fdb2c2316eaa9d2eb62ef18fa5e098e63
 MISC metadata.xml 571 BLAKE2B 8fb52685ec095fe2a192d477c7e5737be2ab526fe5ee9c77f62c8aa1799dea7c471eb3ea073352b2d09e3f1ba82b0dea05dd03648eb810e32504a2707342832e SHA512 36de48dec06abe08515d48f2e2fb86e5125ab6e9331f989dea8fff9d2511b337afffc75a842bf85b051fbe968b220676a4610c0a4d1a6b2c3b83759f9c2ca199
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.19.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.19.ebuild
deleted file mode 100644
index beabb835c090..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.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:1.8"
-
-S="${WORKDIR}/${MY_P}"
-
-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-6.8.17.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.22.ebuild
index beabb835c090..beabb835c090 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.17.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.22.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild b/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild
deleted file mode 100644
index aea75866ef6f..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-Linux arm-Linux Darwin i386-Linux i386-SunOS \
-		i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
-		ppc-AIX 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.15.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.15.0.ebuild
deleted file mode 100644
index aea75866ef6f..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.15.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-Linux arm-Linux Darwin i386-Linux i386-SunOS \
-		i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \
-		ppc-AIX 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.15.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.16.2.ebuild
index aea75866ef6f..6040aa3a3db5 100644
--- a/app-admin/logstash-bin/logstash-bin-7.15.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.16.2.ebuild
@@ -32,9 +32,9 @@ src_prepare() {
 	default
 
 	local d
-	for d in aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \
+	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 sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \
+		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