gentoo auto-resync : 15:07:2022 - 13:42:19

3 files changed, 4 insertions, 80 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 02df24197ce3..5d20e45d2472 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -3,10 +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-6.8.23.tar.gz 178007697 BLAKE2B d7ba85a141586b8ee6cf524b9ab39b6b9a0777df5357fb22f15770126023599d7b62eeafc55dc87e0ff401b5df8dab9084a9ea4ba98c850e2ee98d4988bf4ad2 SHA512 3ee0de55cca50c1ea5b8afbc618783c7e301ebdc570c34d590160468b0b7708afe83589669c08106ac006e64436903ccbb3b3322e2801332b921ea802a788d86
-DIST logstash-7.17.3-linux-x86_64.tar.gz 363469045 BLAKE2B 9817a18b0112f6abe4b4da47908db0543feb981e963d5283e0b0133f9f722f155b84592b7529c74b03ec48307e6797732abb3204e2206c26751414597a676c60 SHA512 bea8a6e4a3f5974739061d3f15ac76b705a5326b43bfb4b488edfefb6bb25b5f36e8734713d536386b03b6d45acbf739a3c9381e61cda344557a2acb4bbb65c4
-DIST logstash-oss-6.8.23.tar.gz 177876480 BLAKE2B d961c9073c1108b3a0e74ba763e0ce45b35a5767cd732e7ec756697c5f1526e01b23c0919acefa173b5410e9a4908920a24c1ce351dd7c09d998cb025ba05aef SHA512 87488767c6239878c1383c1f28ca17e8f330c10298542627c0c44a0620976737a1acbca55b8db6b6917d8b8bcb988ec4d84b2a840a4ef6362909b7e230a0e0b6
-DIST logstash-oss-7.17.3-linux-x86_64.tar.gz 363264492 BLAKE2B 11d8fde29d087fc6956731904bd113fab3d163e29bb302c29aa11ca1b77393e896332da3f6f939008d83b6035672b9e49ea609c734ae6fa7806eabfc968f7648 SHA512 5bc60cdb79b80a5c239c5cef375fb1336d1fa1595fa3556720cb86ee495cc48f9c57d19003de2b9c7717116069d487857c71bff1cc7a4c029841f702c831dc34
-EBUILD logstash-bin-6.8.23.ebuild 2099 BLAKE2B 5af2697d30b52e26c11bb5ec7f3fe11b30be7ac3e0b4c946cb024f46e19b92e99c078086cd64bbbdaddf0ac06b2291813a9b89a474978b9a0d5d5ee6c0d678dd SHA512 bba4fa4720b257d4a58198e0c145e5f88553c783bdd5e2214a9b685d922845803ff4b12e793f9732c29dd19daaa8bf35506a9f5809da0d7f03b1da93daa21b58
-EBUILD logstash-bin-7.17.3.ebuild 2532 BLAKE2B 926b1ee9b2a9699ed0de55bda4e608c0fd9b6eafa6b11b5c1e3fb5388e2e3997f89d367bbb7b95a4bd2dc6c30fe4a6d7719dbf0d3256b0ae09eaa0b78cf7ce66 SHA512 4afc83cfd148c5f24fe8301c5d7691b5f7e046b126afd766e20cec0d49521e4a137f7c3a503a8cd69e92b72d9ef82fdd54d45b3374e9f00ba42ddce0868e1177
+DIST logstash-7.17.5-linux-x86_64.tar.gz 363609474 BLAKE2B b6f6065a997a7401ad6e14d5f1fd6b2a924cf734cab0b7e07444cb800420f3c7b2634cd0be693ce0cddce909f49675b00764fa05ca4f3c3ab75a72387fffd629 SHA512 6508b9ba1a6672fd560773d2282501f9d022bf67a75f2b046ec31219cc78cbf8d35040827838948c69458089a9b30fdf21cbb5c2cc3f67c0812662265e9518dc
+DIST logstash-oss-7.17.5-linux-x86_64.tar.gz 363419923 BLAKE2B 7423ca08f5821439059be89be46df2a3927722ee48a7fcb95b1015f0539526c6ad99a4e11e85e5d6ff2aa340ad5421d1ce9ac26043dd70b1b4ebeeba8c4eaab3 SHA512 d86cc76f52975128c6e9ccec6217a1f289b88048b19cc6c19f8247c614c056532b960f7e4a9f3c7b7a4ea81596e9ca3b7df19249811445273668403f18af5c74
+EBUILD logstash-bin-7.17.5.ebuild 2532 BLAKE2B dfd8efa6e7fdc93820836f68a21bf02e4c0c1eb1c907c4d6a1005d6f253eb83012334d2a9ecd75ac569309d2579331b1e44c8738474f5fd9e071ae9ac81b79cc SHA512 4872a97be23d3276f5722d00e120d336136cd235cd4f10a5b2823baebb00f28e1a5775f0a9476723e8ff41feefde1d53c96fcf1fbdab6d6c1832428985bf73e3
 MISC metadata.xml 571 BLAKE2B 8fb52685ec095fe2a192d477c7e5737be2ab526fe5ee9c77f62c8aa1799dea7c471eb3ea073352b2d09e3f1ba82b0dea05dd03648eb810e32504a2707342832e SHA512 36de48dec06abe08515d48f2e2fb86e5125ab6e9331f989dea8fff9d2511b337afffc75a842bf85b051fbe968b220676a4610c0a4d1a6b2c3b83759f9c2ca199
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
deleted file mode 100644
index 8388a11e7f88..000000000000
--- a/app-admin/logstash-bin/logstash-bin-6.8.23.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 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-7.17.3.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.5.ebuild
index ddceca40f83c..bcfbba4ea846 100644
--- a/app-admin/logstash-bin/logstash-bin-7.17.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.17.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit java-pkg-2