gentoo resync : 01.08.2021

3 files changed, 167 insertions, 0 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 378bd57bc009..1771b0e4390d 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -5,17 +5,23 @@ AUX logstash.initd-r2 1997 BLAKE2B 4a2e36bcd171950ddea636f9269708416536b4f54c620
 AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa882023923967ebc012ef95185e06e33fbec60eaa949df650ebe4f9b18abaa7f4edab25d4e5b429f4 SHA512 9a9cff9472c7cd3164bdc73e37521489979106021b3d97fb2b005b74b150d2f2ee8df983219e01f8b5b00907008f4e9816fc303ace3b440a4b91dd178b6a098d
 DIST logstash-6.8.15.tar.gz 176912362 BLAKE2B 68178b2cbf0ad3ecafc83fddf4c50ef767862fbb90ba7a0dd0527de4f8d3bddc485a99a7e774c6d0efd5b3eb4bf701be042cfc58dcb546c7436db39ff4594841 SHA512 bb42b1284f6ca8d4b10cac96b57cae0f28a33047164f9f9a352ed906a960e11fea3d9c58b23cdd607e0d76eee7aa07fbb6ce8870323e3cc6cba472578d99fb01
 DIST logstash-6.8.16.tar.gz 176912473 BLAKE2B ec7d5fb92a2ef55499b395a855bc5cfd3c953180d5bd443bd70ff792f12c51a6635d1cc60cf115cab6b934c6201f889f8fbb3b3e35a4841b177d42d0d6864c3f SHA512 c272fb8b0e03c37a057f7789989645077279492abca58a690fbc50e8e5e428a8f3c765e7d68d37ddaf927650b563d1ab0f637eb8a5213f4f0475bbfed1264caf
+DIST logstash-6.8.17.tar.gz 179116623 BLAKE2B fa25a3149fded215586d97b3bd2a2b2b168292d45e32f1b69987c9e6e9e6f35100643df09d03f51da042b27acfd57bfcfdb1f4f18fddf7b9d21e01ef84668cc7 SHA512 00cf51cbce906d2594b0a17548d362fe678f458a2e7f9c167d4387953a848a588dbba070d370002a5e4d7ca2df2e3910805a27e3c0263ab29d99042229af0c3a
 DIST logstash-7.12.0-linux-x86_64.tar.gz 368429061 BLAKE2B 7bf60eeeec072e99aec807c8cb64cfd5cd46270d297c717fee539531286f487ef254738a439947e40bfc039778d20fa746566aa4d0c031a8f1a22deaaab9ce74 SHA512 ba32cb97e81cc3f4369c752b860aea7a85d212921954e5829f0b63526584d01c79731dd094905d91ed35f9887ae70bfffd5324b25dc3f23e60745462493e8195
 DIST logstash-7.12.1-linux-x86_64.tar.gz 368465800 BLAKE2B eea395286408de50cf61b2a69f6a673f81c4021370eab9b04fb1a9ad993a5b625145d6710e5045f9572a6a923455fe8613c2262bd488f6e76d467850b1bfa5c5 SHA512 9ef32dbeb4269d904a775a1cf5833b09cc5b8b71c03f953641fd5de5c27ba51ec878d9e74cdd98255d37fcd39d592deea72832bdce26cbb2827db4ae3b294834
 DIST logstash-7.13.2-linux-x86_64.tar.gz 360899712 BLAKE2B 327c5a2820cc42ec0d63bd5d8e1983f37e217e7fe28eebe326a7437b938a3602b387e0138c0055b3b23f8d657013e79a8d7b9b0ad698075667a0c944c07e7dd8 SHA512 706a107fefc587262c27d754ddddce482affc6b12e240895d56ec61e97887f1edf7b0a0888e089827c622917d772f3b9231b6aadf352f5e78c7eee98cfdbfb2b
+DIST logstash-7.13.4-linux-x86_64.tar.gz 361126551 BLAKE2B e972b2c6b992573f0320de0487141c17fa6cd1889d7d266f79958fbc261a4e8564b9f9fc88b654de7e476c6c2747f47e169d0fd3601888035193a2cb844fd710 SHA512 2dba64af5f6b0724a75a8f4f3dc9fb067e27785fd5d0b9ef0571c77df6ebaa89418a165b7489ad47676847c4a9f928cbfc8d3ddc885db21053d0bda9dd524f49
 DIST logstash-oss-6.8.15.tar.gz 176782145 BLAKE2B 20cdd28d9c6e43edb3cc6d60b961155880aaf2e22d100b6641246a56194ba87aef3c41e039be2ab6bca75e646b83a3f42c935472776aa87a4baa774cca74458d SHA512 c74f189af58ca936b3d3e19970f29a78b8f041f5771163c5ed28466e84cf456f4814a9f4c5a9def2706c39daaebaca948c14e683a6aa82b2e1c1e7ee57592dc2
 DIST logstash-oss-6.8.16.tar.gz 176782454 BLAKE2B afdea56bbaa2623548948722f5dcd85172e0d3580c302fde91e1f6d0af66e82538465da9aeb428bbb9e66c7a8bdd29ce69279098d5c3ee9a7c2ac1efdbedb628 SHA512 d994472606cbb474471441a238c6bfacf9c1cdf1adf20129a8bc256daab9ea49adaa8c425c9a41520846465393a2c112ec6c83478579620ebbf446e528accf20
+DIST logstash-oss-6.8.17.tar.gz 178986613 BLAKE2B 5e318903fb134f6096fb983d3651d5d81c2bc9d62421aa7468ee7cb82a5e7895a517911a759d82f1f2c939c3ce67df4e26c1296c0871cb1cfb8078627e68e5f3 SHA512 0f43f9f0dc4a253c6d5a6f07234a22bc67b8866dd6f25837372c1d3c9cca2ddb1b94b632c4528324eeb23019d5d1ae7374661dec8011e55210555e01bec77c2c
 DIST logstash-oss-7.12.0-linux-x86_64.tar.gz 368251521 BLAKE2B 0959b29335dba2728d2e7a76ee482fb713f9d504a52bea1dcde99f042cfd52d9e18067cb3fffe6ca28b2eddddfd4ded1a19de616f4ddd3b6889e373a908706a0 SHA512 5d7bd5ec3ea5907771bb7590277e54be3407cebe6bc89dd7f5d73b02e9e8907855d19500787b21c8ffcff9cdbbb68a4bbb286131d03ce5585ec89e5c2a76dc60
 DIST logstash-oss-7.12.1-linux-x86_64.tar.gz 368287628 BLAKE2B 72e758e6962cc5a24c2a5f6ea4c268be1bc0b5a0ae1d73cb056d0d321b20495df346233e58661f11a37fc5e6c0750f28501af24511a7a29c2e698ce933c7380f SHA512 cefdfdaf2f1d0190d35bc5da2244a5bc09659e9f225cfd05acbdacd0f5f89cc13b928704491d18ac0d54c3500f8c15dc7ca64341bf0d7ed56a49c10eb82a55d4
 DIST logstash-oss-7.13.2-linux-x86_64.tar.gz 360703237 BLAKE2B 130b68f77fb5b52db71d478801afe498ab157f2b38c56e67455b28bc7358faaae9663c79b515031544136e6dc126d8d96b6fab8f7802bf84d5125850540feaae SHA512 0d4cc38740b9a9b44a528a148ea8f2032a27af275bf4508700ec62ae3d74987c4fbbda72b4b6fb4a4059e9be3a7949813ad401187d43335e99b9a280350fba93
+DIST logstash-oss-7.13.4-linux-x86_64.tar.gz 360925283 BLAKE2B 68482538d4b2589044215495ab7d41b4820650908d979438b197c5ee4ff82dfc53580fba7c834c62964e9b12ff23e6d9ecfc6e333a2cb6f077d6d4c953527173 SHA512 d57c30c763ba3323380c7276a49895ce3adbe90700061bdf1ce8c6abe98c4ac0c5789ac2a725f15d8d4f89c80dec691479027887b8976dcd618aa91f7af13d8e
 EBUILD logstash-bin-6.8.15.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
 EBUILD logstash-bin-6.8.16.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
+EBUILD logstash-bin-6.8.17.ebuild 2099 BLAKE2B 04b2c3baf24b2a64ced6d06ecb21518355c75e1bc25e386ec6532d0aadcfe893cff6b2e77cffebcec7bc0f47bce52c158a2c78c0acb37bb6cf1356448d60ca82 SHA512 883dd9967dce6987f956872b0d0df75951b55bc0898eba6cbd85c53a6cb8e6b1e25b0d90f3f95b9bdee3ba0e7577448eec5de6638e6dde9f9432383f6bb1458a
 EBUILD logstash-bin-7.12.0.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
 EBUILD logstash-bin-7.12.1.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
 EBUILD logstash-bin-7.13.2.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
+EBUILD logstash-bin-7.13.4.ebuild 2504 BLAKE2B f2075c4b5fb9dd9a0f33da6fb226445aa8ad95dbf8f4dc009ca2819971a4d2894b12abcdb2a8dd5121170a8f522cb0cf13d9d8605a0989ce6c17b262b034a2a3 SHA512 817c14b140ec357c9cfe4634acf4603ff6e0d48c6e8be32c6b769bd033ad6196782031aa87a030c823e4ea233822263d3556b958e7fd15a907ed20a41d41bff1
 MISC metadata.xml 692 BLAKE2B 4dce636bac8df4bdc8761c340b230db0371df1b127e17de8f9d55225fec2ccea4f59876e88b651427c11047eb24c6993391a2f25a3ac1ec39032d50226e9c99b SHA512 6a22c84fcb90fcb8334a1bd26e240e97d7c06d17251a9f973d780c28b836eba45cde5fc35a46e2cd82bf30f04116c825ec831344fd286f9e84cc430d032f3757
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.17.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.17.ebuild
new file mode 100644
index 000000000000..beabb835c090
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.8.17.ebuild
@@ -0,0 +1,73 @@
+# 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-7.13.4.ebuild b/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild
new file mode 100644
index 000000000000..aea75866ef6f
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-7.13.4.ebuild
@@ -0,0 +1,88 @@
+# 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"
+}