app-admin/logstash-bin: bump to 6.8.21/7.16.1, drop old

Bug: https://bugs.gentoo.org/828969
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

6 files changed, 4 insertions, 259 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 49b6b9840fc7..eb36b0740efb 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,10 +1,4 @@
-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
+DIST logstash-6.8.21.tar.gz 179399165 BLAKE2B 1d56d8b2f1c27591a1eecb8191c3d821e8939cf2550aafdb558133c052eb92dd00ae8cc2b6d7cb40e33a2927cb0a6ff4d1211674e7c4c4dd50bb621aa4cf3176 SHA512 752a4c4b7423df6e34c5b6abec0a2125ea4c70f9a9156009496cc1a1cc7e75321e09631b33c44167a3b88f22e19ce5a0cfe1e2a80bea7feadb4b267edbfa9719
+DIST logstash-7.16.1-linux-x86_64.tar.gz 367216229 BLAKE2B bfd64a27363714da90a17daa6490087fef235b70f1adf873c19c36d72c2039661fffebcfd31ac8662f3f2731660458d1e281adb3c6aa422cd05b6b549caf7d14 SHA512 e4e38df7601c26529210e764314c7e888cacc4195c8fbb7238e5075f3625633d00bf08381bf5b2850cd8d9d11355b28d18f9b25cb51a4a7ddb447cf67ac35e5a
+DIST logstash-oss-6.8.21.tar.gz 179267261 BLAKE2B c50443369719ff76df5a4816985a09fc053f43861bb7860435de612a3c06a81d1459af425bbffb036b067a92b8d0ce7395f4c8f9049ec89a55bffefef08fb8da SHA512 285c4d75cb2e6170c856b4c7f7588a62caed1abcfc26e06f93c0597a71c69f0bac27a20556d8efa468ff74f3262ac875b3d7ea169589269234231f9e6af2a7f3
+DIST logstash-oss-7.16.1-linux-x86_64.tar.gz 367013864 BLAKE2B 38d3238fd44403beda08de6ee926eab9429652c63002dbf24f5815cdbf4e26bd7d9fe015b5c45db2c280dc9cceffb0f062b0102e3edd073e03bfe4542b27af80 SHA512 91b0272b375e49748f06ccf456a31593e09b06a4bc11074f1e68c7648c130baa2b12ae263df9cf95118dc6f37455e3915f379cf04cf336faccc27a7e88982677
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.21.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.21.ebuild
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.15.1.ebuild
deleted file mode 100644
index aea75866ef6f..000000000000
--- a/app-admin/logstash-bin/logstash-bin-7.15.1.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.13.4.ebuild b/app-admin/logstash-bin/logstash-bin-7.16.1.ebuild
index aea75866ef6f..aea75866ef6f 100644
--- a/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-7.16.1.ebuild