[gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/

["Sam James" <sam@gentoo.org>]

commit:     2e289c3aacc770d3a593507a749106882251096b
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Mar  9 13:24:49 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 16:23:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e289c3a

app-admin/logstash-bin: add 7.17.9, drop old

Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30017
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-admin/logstash-bin/Manifest                    |  6 +-
 app-admin/logstash-bin/logstash-bin-7.17.7.ebuild  | 88 ----------------------
 ...in-7.17.8.ebuild => logstash-bin-7.17.9.ebuild} |  0
 3 files changed, 2 insertions(+), 92 deletions(-)

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index def04303704e..9a651eeb0cd6 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,4 +1,2 @@
-DIST logstash-7.17.7-linux-x86_64.tar.gz 364120719 BLAKE2B 42622b2a4f3b53151de4effcc248e2225d2a2bb42a2e8ee5b0408c671050c27006910a956cdf8c4ad97ae9cce36a119d86d8234a86eeae3f19cdaa3da36bda3c SHA512 eb8d01ad82808598c4d34da9194f069a0c55e86d70a9d0c7d78555fc47d156ec4b19ed1df9096b953171e8ee918ec97db6a46c7871fe328ee544848b22812bdc
-DIST logstash-7.17.8-linux-x86_64.tar.gz 364452036 BLAKE2B aa71108bd3632a8feb66de6d1b6ff4baaf195cdc808753c6321bc941973c51c759431fb814faba4c2eb3d15d848584098319bccdabb5fa8bbcdd30025921665d SHA512 b78fd253ca575f6392cec32c148c63df1c6d146f50e18fa3231c6e47174d3b7024e65efd88a06f0822d4a7f058737d96b8ef0b2d09b3491e166f4f8cef6144df
-DIST logstash-oss-7.17.7-linux-x86_64.tar.gz 363922131 BLAKE2B 2cc8754b0edd5d1354c258e6da163a6cd806d8e9e58f291b4c81e5a39a6b9c267fea807a4b062e7cb171adce926cb711a075f29804d1629d07bb28bcef47620f SHA512 f8a9a09bcc234598cf47334f59bb8651255ed16780baec0547f21cdd79c47caa5da1330c652c0dfb0bb147ac262e1ec9320e80b76f37ad89e05350c6239e4dad
-DIST logstash-oss-7.17.8-linux-x86_64.tar.gz 364254903 BLAKE2B 7072ac8634ab8530f740d3e72c8899b2c9ef213aa122460a43b5a532e6ca1aed47c08890f4e83482f49d1e1191523bd6ef583f35fa5e37c080db5926150f996a SHA512 d770c7666fdf04d2d09f7213ba436e66b09e6e650fbe0f0a147914525d55d545c8c85e50afef0803483850dee0661b1da09ab81e43553424afcc957d94d4dc81
+DIST logstash-7.17.9-linux-x86_64.tar.gz 364476389 BLAKE2B b02e52e0a9e9a8b7d6b7487333417a95363316dab8530c180b8a42e63f35a20628d9830cd596a6a960d6cb67603dd1f1bfc293ba2705a4683824aafafd8acbc6 SHA512 a43d592e70f023a594f31a3fba365a9cca6611599bd61f998cb1fc38ddd177d459bce23eaf54f811fe0a87a47cdd4bf4b4d4c8008dab1ac03173371f63b91b6c
+DIST logstash-oss-7.17.9-linux-x86_64.tar.gz 364275206 BLAKE2B 06befbe70974ebe740caad79527b92d78d034de37461bf1883862463fe6b063d7a3759729a6191277c2c5724faaccec315c77c77ac384858f34a9594d400abfa SHA512 7c3f9867853582e5d06b9f895b4740abf56a9b6ce34dfbfb624cf9a4b956f489145cd13f3194a7fb16efc52410f55e797c269dc2957a35bdebf9e1aaa3547eaa

diff --git a/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild
deleted file mode 100644
index bcfbba4ea846..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.17.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 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.8.ebuild b/app-admin/logstash-bin/logstash-bin-7.17.9.ebuild
similarity index 100%
rename from app-admin/logstash-bin/logstash-bin-7.17.8.ebuild
rename to app-admin/logstash-bin/logstash-bin-7.17.9.ebuild