gentoo resync : 25.11.2020

7 files changed, 47 insertions, 91 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 28bc9910128e..315a146f04f9 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,24 +1,21 @@
 AUX agent.conf.sample 409 BLAKE2B c97d35ccecedf47c234e2cb1b3bc20b5aea9254bed08f06e744f44e3567eaa88d232f487a8c185375fc8ba4ad9cc9b15f750649286f1e1c4431d732dc5847550 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0
 AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3d419ebba97e688ba151fc34b1cb4a77180c36cd02348616a5069d4c013302270c0127fbe7e836e3f866569d1d SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb
 AUX logstash.confd-r2 767 BLAKE2B fa251570a13b2bc2d0779e0f00549f40bc957f211be0f4164829f7bf731221e5adabdb27341c703f1ea67b19455e8832f5d822fd41ffc64994007201690feff6 SHA512 83eecf30baa160041f33fd3dafce317c1692efaf676d0fdc9bee04965eafb15f1e01d07a09607d345665f6bebc4db90d17a0abd1c7fd4962d6926ac069f16768
-AUX logstash.initd-r2 1989 BLAKE2B efa16227a2cf1a42f1f9e27e110dae64c7eb6547e22e89a71b3394fe587e0f83468e361d335e28b15a1507959dc26c019ae8ac9bc110f1b8a6896ceb7f3ceecc SHA512 77c69600f22d31e7e08c2d953c99bea8a24ad83c7abdd578526b850ca37c963a91cfd245b70e4ddb8d405135230fbc641768de2dc4dad096a0db3d40313acb2f
+AUX logstash.initd-r2 2000 BLAKE2B b3c01476099afdb3a1d442580f22e536054fd3ed6089ac2f37aab3b5c94f2a95f1d08706bfba819d92eec2ba24fc4ab199eab6ed3aa4f96449cd935e17cbfb7f SHA512 e6bfda9e434c5282d885c4bd0262ed5d27368c7b23eab5fcdd1c9ed6cd86679d1ac677c90f8634bb9d1c75c4f4dae1c568f63bf3d5ad82a84c01f3a1dd1cd857
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
-DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6
-DIST logstash-6.8.12.tar.gz 176911027 BLAKE2B 03f95452c3823863e78a24c7bdf2709cc4041b19f94c96e747d6398576aef2f3d3cefed311301ca40eef8c6cd8ce4ac2b042a08d664b7e7f83a0df226bef90db SHA512 4070e813ab39b884f05197b9c8c983770af93bfc52bb7f31dd5eb375d509b31f56a5aca5b8a7011acb4fa506d991bef8567e6f4b2f0ee72cfce67089c80bcb47
-DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
-DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
+DIST logstash-6.8.13.tar.gz 176911221 BLAKE2B 644dc67dea638e2e2307e807bf2f08e9758db4f8b1a01deb13585b925ceeaaaafba0e573f125c095603b5c7e5329ae82677472c72f53af9d26d792de31c896ed SHA512 f253b566e8f67063bea6dd183ca495d7b53b0062566278e0937af71763fb0b3339ef90c7620edd3370719faa2c49a162e1757141fa60b7136e9d9c3d83657d32
+DIST logstash-7.10.0-linux-x86_64.tar.gz 351102587 BLAKE2B 47f8d84d4d42a313e9c2b17fbf3b0aaf3a22145b3ba27a5f6a272e9698c4a21ef061752010ee8c37539373c033eca910ba21f799e87a9f155141a1bd09cbf3e5 SHA512 f9484bb2e3511ee172fc96b7cd0649a5ecc581f31672f54690e03d0efae65e0dda091143db3486a671012b5c7382bd40d8aa18ca39768fdc88f4c7a4e5b373ff
 DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
-DIST logstash-7.9.1.tar.gz 158473271 BLAKE2B deeaccb5dd1c9acc52ee395e699fa67d816dfb4144068409f375c20a161837d07f4b0ad269f044076104bc57d84d2decf2bbb4bce17c00737afb74186e706ebb SHA512 d7e359523f4a7deba095d6a1a71f141c29ecc4cf58cdd5f81ea5af80d30be9716b1a9c824d4fc000cafc9457cf7d587d346fd8b1d0d04411a7fd8d280054671d
-DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
-DIST logstash-oss-6.8.12.tar.gz 176780408 BLAKE2B 4a58efc6e12b6f390022f8d4fb3f4cb3abb4af486eadd65bed840d9a0e8bf0a02659d23d7de6e0cf7068f9e3e20f65cc4e62a39350f60e1f7b3af56e3bcc3859 SHA512 2782b029a2e4880282518ed591a9dd2ee7fd6e6aca15289067f3f45922e0b1fd6adb036b4cc5d256d9aaf8d8cf06bb4ff59cfae6519fac549b6b7f36700f7c94
-DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
-DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
+DIST logstash-7.9.2.tar.gz 158690951 BLAKE2B a50d959d0d032896b64f2957f299efead1ef51cda77c440f612500ba7193bc8cc81b092c59513dc70a412cf813920df4da5cadff5a494136c5d284d5b9060f34 SHA512 54ec3f58f6fea9d8dee9cbe8eaf755bb9f5d26858082f6594f6fe5f006af6e3f2ee2d5899ada71ef4ad6856d27c0c91ad7a0769aea16c09a8cf6ab234ffc939e
+DIST logstash-7.9.3.tar.gz 158711139 BLAKE2B 5a5426e3ee41e3f985318e7356a3b13df1042b887a627824e9d14a73839e648ea6291333921902320b20cc3e474a15d9b1f4c76bfcfdc0b6aaa08ed098df0ae4 SHA512 f4bfc97203bcad589d3682a4dfd8f7e6172efa958775541b128f43b151cedf4065b1eab012d60a8aa5005dbb504e4c3638a26492c30fba3ba5b271ad17876f25
+DIST logstash-oss-6.8.13.tar.gz 176780212 BLAKE2B 68a5f262023f75525e8b8f98d279920011a0a4cbb34c7297c51f3e45034ab12ca2e2f57b2bb22453107e24fdbca65f16f73a69776fbfd321ea87c6fd1b8d0292 SHA512 0919c8f7bbf39ac9cb41d0065267eb39ba359393e629bf360d6795a68efc9444ab99c7287c533b53efe9ec74fbe403ebe5e5e178b42c48b92d79281a3a5f2045
+DIST logstash-oss-7.10.0-linux-x86_64.tar.gz 350920148 BLAKE2B 77f2a8668a7b3e46224da7383b34ebe632360d833a5f99d010afe94e48d5f3ac2431fb1f220bdf28b9bdb1a8639f9f64db07862bf24c4f340caba2403d60ac0c SHA512 b9deffe41ef051c851b6a456cebcf66cd2a17de6f49dcac8cdb29189ebbcac0ee286b9973456fa8a37bebbf7ba34295cd192f1f5c9dbbdde7da71fde126c230e
 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
-DIST logstash-oss-7.9.1.tar.gz 158289592 BLAKE2B 91d89b4375e51721a5d3181b916cdac33b65e4a020bdec57b3bece9b25595e1588366c69c9e07e4c25b148b4ed2703eef936d1924fac7387fb25cf750226f089 SHA512 ddd6c0db8b59b9ad719a69f04eea81e0261061b5a26569819d4c9306c6f3a63acf575bf50e5f22b17e9b44ed8750d83762b41b866a25b2a2e283b5186c9cdf61
-EBUILD logstash-bin-6.8.11.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
-EBUILD logstash-bin-6.8.12.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
-EBUILD logstash-bin-7.6.2.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
-EBUILD logstash-bin-7.7.0.ebuild 2095 BLAKE2B 496fb1f0b2b0c790831ebda7223d315fb0041c93e774f7a6e6985bf820b19f0c79d4ea30383f37403f8fa87308506f2a49436d28e832d4bdce82ce893cec1c87 SHA512 600ae4e607aedeb893dfc9dae0b65bab48e9147f831908fa8e096802d883bccdf82dc66fa73f1bab0e60e0b720c5f40e0d1fc15e1c101b6b6d6d856a323f54ca
+DIST logstash-oss-7.9.2.tar.gz 158510234 BLAKE2B 568f5ba0ebe2baf75211af2e4c859ec5496e28149a060d7688606b56a7972924f0a163914f1c085bc2600694bfc7363fa5300785457f64f3210b97e1074c7210 SHA512 dbd83299a5b3ec76f3e4b235d0b6aff9aad2ab395412b570e3ef82c2ba761a1899a7009b117af9b13b623c00579f323751da7b54c613047efa2558394a19387d
+DIST logstash-oss-7.9.3.tar.gz 158530838 BLAKE2B 0a37f05a42848e6d99ac6741f7fa92a73794d292ad72f793754805d45bdff940163875046258148f71cf953ce40be8747d201d0782de0cf60f2ed16db0136b29 SHA512 13d7a2e417d061b838c8be8a2a874f5964fd32c70cb437ab4bab7c4f8a17882b7874dabe53ba6a588250e56557e972b6d1f5be7970debbfbd893d4532705e6f2
+EBUILD logstash-bin-6.8.13.ebuild 2099 BLAKE2B f5902b9254e045789a41627c84b5a4e340268eedb1a96a266e20279a9d718ef28279e59b63320fc1d35b2e701acb5ce61a925687cd479d46a74981e92d744618 SHA512 74f8b2a81f63e5d41b373e5cb08f99560afa4f59133bfcd7955907105457ea94cf84fe07f5501e011bb2b69d388207e160057c79ec206589e7d195626fab75bb
+EBUILD logstash-bin-7.10.0-r1.ebuild 2504 BLAKE2B 9e4e24079755eb80b22734c42fa02545dd31d781399dedb61d03ed6ab29635b5c2890f99c391bd7d9521cd7845bcc51518d0af5c53c186e6e476a7599949f89b SHA512 e40cbc468ea8039f2e196c1f29117c5685e2d21bc85e90518b1361584025e40b927833a0c95492cb9ed32862b374463ddf332ba3bd960a928802d8ca1e4f2e16
 EBUILD logstash-bin-7.8.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
-EBUILD logstash-bin-7.9.1.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
+EBUILD logstash-bin-7.9.2.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
+EBUILD logstash-bin-7.9.3.ebuild 2723 BLAKE2B 8c038f1aa7771e46a103e39202d6f4955961979697551c8afda5d595f3f433615fffa07dffbc874e1f4b272eba89dccb05f4878aabe338c0b19927b8bc5a7df6 SHA512 4ada3d8be1faf138ae3bcd1c762e47499ecd7c97c53c9e7e12f3b24785e87d6fa6d59872439bc49d34ca7172ff25f56120a5b3a4a746887077cb6d06df4bd962
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/files/logstash.initd-r2 b/app-admin/logstash-bin/files/logstash.initd-r2
index e05c837ae709..e76f00ff9a3f 100644
--- a/app-admin/logstash-bin/files/logstash.initd-r2
+++ b/app-admin/logstash-bin/files/logstash.initd-r2
@@ -21,6 +21,7 @@ command="${LS_INSTALL_DIR}/bin/logstash"
 command_args="--path.data ${LS_DATA_DIR} --path.logs ${LS_LOG_DIR} --path.settings ${LS_SETTINGS_DIR} ${LS_OPTS}"
 command_background="true"
 pidfile="/run/${RC_SVCNAME}.pid"
+retry="30"
 
 start_stop_daemon_args="--user ${LS_USER}:${LS_GROUP} \
 	--chdir ${LS_HOME}
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
deleted file mode 100644
index 08167fb02874..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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.11.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
index 08167fb02874..08167fb02874 100644
--- a/app-admin/logstash-bin/logstash-bin-6.8.11.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.8.13.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild
index 9e7d19873de3..2003a547d375 100644
--- a/app-admin/logstash-bin/logstash-bin-7.6.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.10.0-r1.ebuild
@@ -10,8 +10,8 @@ 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 )"
+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 )"
@@ -28,6 +28,21 @@ RDEPEND="acct-group/logstash
 
 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}"
diff --git a/app-admin/logstash-bin/logstash-bin-7.9.1.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.2.ebuild
index f47057329667..f47057329667 100644
--- a/app-admin/logstash-bin/logstash-bin-7.9.1.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.9.2.ebuild
diff --git a/app-admin/logstash-bin/logstash-bin-7.7.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
index 9e7d19873de3..f47057329667 100644
--- a/app-admin/logstash-bin/logstash-bin-7.7.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.9.3.ebuild
@@ -28,6 +28,22 @@ RDEPEND="acct-group/logstash
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+
+	rm vendor/jruby/lib/jni/aarch64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/arm-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/i386-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/mips64el-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/ppc64le-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-Linux/libjffi-1.2.so \
+		vendor/jruby/lib/jni/sparcv9-SunOS/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-DragonFlyBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-FreeBSD/libjffi-1.2.so \
+		vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so || die
+}
+
 src_install() {
 	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
 	keepdir "/var/log/${MY_PN}"