gentoo resync : 24.12.2018

2 files changed, 80 insertions, 0 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index ae5f2a048ad5..5a9959eaa1c6 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -10,9 +10,12 @@ AUX pipelines.yml 285 BLAKE2B d256148500854501d8e17c04a0abdcbf1be7aeea6d0e1eaa88
 DIST logstash-5.6.13.tar.gz 104517136 BLAKE2B c4f0ba5f8e1624ef0493e553166a3c18aab9c4d73a661a5f91988627ec8470dc8a1b52461673e27169c8c10b33dfdeffeef96e70e1a8a04b7ee4a1e71a9afb68 SHA512 df12877b8d28ce9392f9d9ec9414205dd1f628a8e927c8b31f0ad3c3c7b11108509fe6b44119faa3f1bab393ea7be74a3a7c5b5b6b49d6ff5b54ce31fd024a04
 DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
 DIST logstash-6.4.3.tar.gz 153936585 BLAKE2B efdcc4664587a3ab18e2e78136c92bc643e99989fa5ac1cd1daaeb48ca1f6fa57f122a5686ddcaab59d920a0ef0e59dc70f59c05a520b731347f37d8faa78c38 SHA512 39bab1b9b0c9f0006c2ad7aa152b3863179030352202ec0c4c4a887bdeb98d4c34127699655cfc7c5b9f44119b45de9629bfacc670d520dcf266b3298fdf2484
+DIST logstash-6.5.4.tar.gz 160286824 BLAKE2B 6f76edee968566539670b0ffc5462a0a417d39dc8f7d3fab35704ace23c27503f7051a064fca2820d52b100a19818621841356f8e1df20a80c95902f4c1c7f95 SHA512 8dff51b3944219b462002d0ced4ae7050d8ab8f9335de1132be11ab8e7277731f319c5794601881ee94350152725c599093316c5ef55ddc95279697ec794cc57
 DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
 DIST logstash-oss-6.4.3.tar.gz 153809786 BLAKE2B 774e67b7f3b89747299fda520456164186e843dedbea4b6727fa325dc8148ea1b25fcb2105e76b84330729a55390e597fac93cf2e2f258e83f2b6cc1c1091372 SHA512 c84e4fcdbf8e96e5d3005186bdf45f20939bb065f02370128b4e15273c4c0fe5609bab606fc7a6a2b71fcee90beb3f435ff42c9126efaed436bf5af1d784c56a
+DIST logstash-oss-6.5.4.tar.gz 160157672 BLAKE2B 47a6de33697ccc04ba08cb15086cb17ead20a38c9348619ddcd383e61c20265864451939f5be10ec9ebd0ba9b0667264af389130f87181734b942efa49c7e705 SHA512 0b8384e48bc584236fa7369339843c9aa1d08fb09a80e209beabf8e029f2fb5a4a5a1a5ef8b91f069cb35472d3b8147752749a4f6a84c6fc5a2cc801ac8d3c91
 EBUILD logstash-bin-5.6.13.ebuild 2195 BLAKE2B df43d04421b3463a427cb2d1c6a1efce021ad8064d08a004535463c6d58f8b41d5dce3fdfe81f556b949151392d373a0685e24a0c0c65d2ee405c6ed834760e5 SHA512 8acbfce31e3484fbd9d9de4337f981bb7d720eb7fda7c200efed822a645c7b81318a4f8642dee620ffd50fd365eb9d70d754cebf666fdeba8a405a2b4f5d5ada
 EBUILD logstash-bin-6.3.2.ebuild 2188 BLAKE2B 7256bfb5ecd30e4cc14ff6173e3faf9631c51e8d7f57edd8c415b661ffd9bdcc8e3f793c0acd3320fd7bc4589a992889d215ab16ad26a8ace452a54f0f50f517 SHA512 5390442582c1a9c7a05b0709376fdb8be89cda413f201a25c3e80c74ec72328b9aee554e875293d824349139188ad29585374bb9077fcf4634145d9e18d5bc9d
 EBUILD logstash-bin-6.4.3.ebuild 2185 BLAKE2B dfcaa0e47c218e234f46096cba58dd2db1fc629262eeae6e988e599fe827c99bdbeb956e5f2c89f230e0791caaece1a8ebba257d9aa33a13f98b6c2ebd042b90 SHA512 683341bd6666acc3fc1dc5308e5d178f006f338590c1be96e116aa2ebcda4d2b74563eface36359624d03eb1b4023d378f9357722855e83fca7edc6f66ffa665
+EBUILD logstash-bin-6.5.4.ebuild 2185 BLAKE2B dfcaa0e47c218e234f46096cba58dd2db1fc629262eeae6e988e599fe827c99bdbeb956e5f2c89f230e0791caaece1a8ebba257d9aa33a13f98b6c2ebd042b90 SHA512 683341bd6666acc3fc1dc5308e5d178f006f338590c1be96e116aa2ebcda4d2b74563eface36359624d03eb1b4023d378f9357722855e83fca7edc6f66ffa665
 MISC metadata.xml 648 BLAKE2B 1c6bd205971968cbbc720f093853d6f3eb069787447c3e4dcfb12bd345c75adfc7f47dc34a95d28f7bacc77f9e863c44880e15afbcb0fea5468d068b02a53923 SHA512 2fe18cd9d1ae40093e6187aad630c04d94c85e400808e74d3755c7591d260f86b00dff4f1cb7dbe905b014d1551ceeaff1ce4ca21e2c755097600733448453ab
diff --git a/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
new file mode 100644
index 000000000000..7cc0ca6f38b2
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.5.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 user
+
+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="virtual/jre:1.8"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup ${MY_PN}
+	enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
+}
+
+src_install() {
+	keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
+	keepdir "/var/lib/${MY_PN}"
+	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"
+}