gentoo resync : 26.11.2017

2 files changed, 89 insertions, 12 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index aac2b4f9f850..2b37ec2afbed 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -1,14 +1,14 @@
-AUX agent.conf.sample 409 SHA256 d8f0ccd0e852396459bb68e46bb2c3a87ea0ed20ffbef34b26c1ec61910bb624 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0 WHIRLPOOL 9b51aa49174e5a7481e36057260dbcb3e119f34c9f7bf0f72c83dbad65c78920f3ab9d62295a0c7198ef660967fe976d67866cf393741c1d27930004d4e06144
-AUX logstash-plugin.eselect 1768 SHA256 762afe30bb09a0d0470d2f29f9371042044009df04831456e4d195b9ee08d70e SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb WHIRLPOOL 7f781cb0ff4cf32e981284fb95fb683423c0acf25c7c2e8f28f0a1d0bd84686bd7aeaacd1779af55bd4ea6ab6f8852dbc12fffd565e5a4b8fad8f8404d32ad9d
-AUX logstash.confd 775 SHA256 d3121a3b49f4e516c6a138e0a571a9b20c22e0653052998a67aa508d6e6c3fc4 SHA512 f0d9270f9158e39ee6b3f0a0e626c252e425246fa76098055161e97c9b4cbe14a9f4db2ea9c64636ef5adba7dd72ac3451af63cfcf4598517c29f8c5efcba14a WHIRLPOOL 09b626a3ffa683a2392ca3a840f3a550ad0a888810a0446f9f5a34daa6050992c42c23a6b68eee999457e7074b8289e125053be2e02b6bdab8f5d5d218bb1764
-AUX logstash.confd-r1 837 SHA256 38ecbae83559e695d41e75e6bf2944c72679bd742ec808ed1e3e536bc5bf4a7c SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e WHIRLPOOL 210033420695d85e864d0bb100e100004b0de071aee8305b25b5d22c6be7c0b14a671fd034d7666cb78264adaf1978fb0a2b06dd0420b2622e01d4b8fe843b52
-AUX logstash.initd 2091 SHA256 228a8f760f9f47667fa44e4138f63fd141dfe5d5f6c4bfd6d57b037498b86e91 SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30 WHIRLPOOL 17516aeb4c5ee5b0565eb33d7f47b727dba1b745c597c3911e1ef1a8a8bd92e1cba2e4f3ea372e8772db4e2d0466c044cdd5270db3122fb8ba417941621216f6
-AUX logstash.initd-r1 2176 SHA256 516b6c3813692b069b18e485fb087c31a946d440f45b8a00b7c3f231a683c2bb SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af WHIRLPOOL 2ef498b7b095bb5753dd1afe1aa642fb2f6686b9b9b254610ea528405d00a5f0d1084a430f04ccc02f892c6842801a19b05785b30bed902989ebaefd3794afa0
-AUX logstash.logrotate 103 SHA256 404746c99df44f7dd617fc6c435251018ceffa3820995a00f1241ac4065da124 SHA512 a5b508d49889dc27722ba82322082b3845449ce99e9e65a4936ed2a49ba2a25a55c0d3bdb31f560da94190d41b39192548f63074ecf5376b9b2b9b73fdaa0ff6 WHIRLPOOL 0a6900c95dea6e52bc8370f21c4becd1b1d2d23c5ac2419fae7f182129874de6ca4f53c36cd7f1a86d117646933ddb2f2866d6d21952af46f8f0924e34875eab
+AUX agent.conf.sample 409 BLAKE2B c97d35ccecedf47c234e2cb1b3bc20b5aea9254bed08f06e744f44e3567eaa88d232f487a8c185375fc8ba4ad9cc9b15f750649286f1e1c4431d732dc5847550 SHA512 fd9a5fc56d7329113b589f71de030e02c0e1d5575b4ac9fe340fdde6d65d44bc0408f67cc36b6ddb248beb22cb7059727a99f5dc5d92ba2f59816a023a915fd0
+AUX logstash-plugin.eselect 1768 BLAKE2B 539246fb1c6e00fa0928af146d3c32ef69f61e3d419ebba97e688ba151fc34b1cb4a77180c36cd02348616a5069d4c013302270c0127fbe7e836e3f866569d1d SHA512 c80c0f2942643dbdb56c21d2ae0679ac92fb5c84b4f51cb426108c1030434fb32bcadc7131bdaabfe34a458e2bf35965c4acccfb42b99c790a26c2b9ae2a24eb
+AUX logstash.confd 775 BLAKE2B fdcf55e1155c746764aa765350367c421f9ba84b6a1a1cdba94f482bbb3afc904af0995929d75326947e5fc0cfd51bc7608c19a04dd52018cb696d602c39094b SHA512 f0d9270f9158e39ee6b3f0a0e626c252e425246fa76098055161e97c9b4cbe14a9f4db2ea9c64636ef5adba7dd72ac3451af63cfcf4598517c29f8c5efcba14a
+AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c23c64e2f2811155355fac51e1af7ec079a8dad7141c2ad3e0eecf3b58971efe3352d4e61d210b46400 SHA512 7a7dcbfe2a8f80804083099a942ca51b235440cd356c1e2310ed060c9260ca0ee7d970b0f5293c67290b17bab4e9c8e0669bdef98f51ed1a97f83ae444c7861e
+AUX logstash.initd 2091 BLAKE2B 980722c1c3cd0cc60cf440d5a06185c66ac4348c0e8990036812ad8f5cbd4e2561affab3ef1de2482990635169afdd10c0841167494d2bf024b28101a0df45fc SHA512 5592918e82182f638a02f6446f9103f70274fdf615573aa4463fde1dfcfa7955c715b0fdcb1f98de9c19ab86268b439d253a696b27f32e55d830cc3839231e30
+AUX logstash.initd-r1 2176 BLAKE2B 37c05148d3789c69805ae5151bed5e297d71b9d60d71ff98ed411ac59b73c4a2a9462e6223a2c960301c6228c84879460ae0f793a24806768fb727b01d982709 SHA512 392c8297c6429e0384dd75073773e1f8f51dd62fd155b2a524efd9e862df114b13cc63cf37237526aebe838b5ff26a8f26a3ad08058a56a723e25025df9a16af
+AUX logstash.logrotate 103 BLAKE2B d87e7945c35a01e9c62731a4561d0dcbd18413717ba656ba69b449d94c9c4cfc9c690dc2562e348318b93b477f9407e0be5041bcbc55a6797d7f0c0a5cd7be65 SHA512 a5b508d49889dc27722ba82322082b3845449ce99e9e65a4936ed2a49ba2a25a55c0d3bdb31f560da94190d41b39192548f63074ecf5376b9b2b9b73fdaa0ff6
 DIST logstash-5.5.3.zip 99551442 SHA256 f81ff55feb21ff4edd4283938ac8362c2906d98f9427d8660dab8465e08f0da9 SHA512 a4328ad0b8192b7c5aaed155d608d9db6adeaefd640e461ef4467daa1a28a2ae25d6b2b1adcf47c5dd82b66fc1adbf8ba5f3eabcf7e69dd8719a5860795877aa WHIRLPOOL d3482df4a7729f6b34973816e39315c69254a641e9811131d7d5e12ede54003a326c5773e799ee471dda01a6113762919ea81ab56ede62d29221f63ed5a7f8c7
 DIST logstash-5.6.4.zip 109819435 SHA256 8809cee0b4199eafd5e3094243929d24b0d22c9d2fcaa473cb7031207d079ca8 SHA512 5382671758d905bbd89f9e05eff9ffcf4a3bbc4fca6f06844647c31df3f50198c297daa0151915c9ef1f0cd741ccb9fb12a7fa13cdc429463d92783c92624717 WHIRLPOOL e1d4cea766025564cb12720528ce0819b3787fb4ffc1901593786d79195ea1584834b70d0406d4b39dfcc236c9239af9e63b37e497c9fc7a79899a4a5f62b429
-EBUILD logstash-bin-5.5.3.ebuild 2158 SHA256 4aa6c176f2f6b82f5661ac5cc32f784e1ef80e07ae62284bbc14a2968aabe7eb SHA512 e756ea562c886d1f4d1f1196a683eb17ef7f36de2dc04ca61d9f8f10bb458b779efe00c4a8c2d24360a99fc0691ffc3c509d8ef2da1d7a8d8d83b5aced7d8dca WHIRLPOOL 4e966f89a00e0e87100d810aeabc46314f040c23f9615c0346337b1aa0153b6e18b28cc55c2a84328988d2c16c68fe90f38c4abd921f1b0fc2272978133b30d1
-EBUILD logstash-bin-5.6.4.ebuild 2200 SHA256 2f911475777e0f1ca15b8d5e8493967e9476e8c31cdac5f86c25649505e15f5f SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85 WHIRLPOOL 7509ecc5cdbad4303389b0ca2f92074369d516750de1c381390f60e136fb680ed36e500294ea6b69cf8337d09e5f56959cc571467d542e9eb9f19dd6878844c8
-MISC ChangeLog 11629 SHA256 9309ec6269563641ab027dac18b6db0643e4097ca03ece455adb5f35148ca672 SHA512 d7b9200f9d2ea056eff3f564ac0bae29d018af1596e954d69d8f57f16678ba5b90fa76e1f74f8e0a830bf2ffa8255a2b9987470aa1a83bbd6135410aaf19586b WHIRLPOOL c31c703601c3b788946591ee5eeb7962c27b368fe4b95235e51947be90510917901a50b1134ffc2cdde8a3e7503c52de140f6af21bf0c4e74e8fe11dfa40daa5
-MISC ChangeLog-2015 1201 SHA256 b789b9b4f8fa642f89efadd1fc139304bea788fb2e91899556992e95811194a7 SHA512 f13b81a399382943cd6982303660b36633e108f71ecff4457ceee3ca3d8ee3ddfa75df69e3502839249eb68e2823833aaf9089c165569453e8208198b44755ee WHIRLPOOL bebb44c1c904ea0bf0c0c907c041399583479840c591946cad10523ad78e75b4739bb5f4728e1e91dbed4f42fe381a329e61103e9d8c65636547f38f3f7396d7
-MISC metadata.xml 578 SHA256 0198cb4bce189b8deb37b0b094a0a6ed934539ef39081e916efc2324a5722640 SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049 WHIRLPOOL 07fe1cbe860745fd932e66360999d0fd3baae93a0de8782f9cd8472ebbbb20f0cd08e2681e1abbd609db9862f07a3c1551d8ae50a1016a2fa53bbe9c1a29dabf
+DIST logstash-6.0.0.zip 118915764 BLAKE2B fd99a2d73c0f7bc381154f197353cb8a5f55f8c278b8381207b3bbeac13dd7850ae4b994dbcc582324b11e7a9bfa6807bcaeebf5506b5234bc6ba0ad62009182 SHA512 9d830f5a88e51b5076af13cc2909fd42c7a75de9466fdd0e7379dff20e7f6d6bfd97b6005278222fb3ab020aa98a572023fc36a7f7cde2eaa4d9a1745f3c82b4
+EBUILD logstash-bin-5.5.3.ebuild 2158 BLAKE2B 78605e21a12f389c8a9c771a9dbf2fdf0f49224c0966f378699d2c8da92f0c5375e99102629dd21e6103da7c487e0a19d447dd2541b3a28cb746a23ab912a0cd SHA512 e756ea562c886d1f4d1f1196a683eb17ef7f36de2dc04ca61d9f8f10bb458b779efe00c4a8c2d24360a99fc0691ffc3c509d8ef2da1d7a8d8d83b5aced7d8dca
+EBUILD logstash-bin-5.6.4.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
+EBUILD logstash-bin-6.0.0.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
+MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049
diff --git a/app-admin/logstash-bin/logstash-bin-6.0.0.ebuild b/app-admin/logstash-bin/logstash-bin-6.0.0.ebuild
new file mode 100644
index 000000000000..f5c2a9c0a255
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.0.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
+
+# source: LICENSE.txt and NOTICE.txt
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+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/startup.options || die
+	insinto /etc/${MY_PN}
+	doins config/*
+	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-r1" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
+
+	insinto /usr/share/eselect/modules
+	doins "${FILESDIR}"/logstash-plugin.eselect
+}
+
+pkg_postinst() {
+	ewarn "The default pidfile directory has been changed from /run/logstash to /run."
+	ewarn "Please ensure any running logstash processes are shut down cleanly."
+	ewarn
+	ewarn "The default data directory has been moved from /opt/logstash/data to"
+	ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
+	ewarn
+	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."
+	einfo
+	einfo "Installing plugins:"
+	einfo "eselect logstash-plugin install logstash-output-gelf"
+	einfo
+
+	einfo "Reinstalling self installed plugins (installed via eselect module):"
+	eselect logstash-plugin reinstall
+
+	einfo
+	einfo "Sample configuration:"
+	einfo "${EROOT%/}/usr/share/${MY_PN}"
+}