gentoo resync : 13.03.2018

3 files changed, 82 insertions, 3 deletions

diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 06d4e65b0711..ca2d3e81f240 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -4,10 +4,12 @@ AUX logstash.confd 775 BLAKE2B fdcf55e1155c746764aa765350367c421f9ba84b6a1a1cdba
 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
-DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8
+DIST logstash-5.6.8.zip 109269226 BLAKE2B 7537b1a9687cc1f45f2573ed0ac9d4065bfc7e6d94e5a9d861a4227ace47346f1320e2fe9139a6bb82b8a75d5b4766e9a1e844dcc43c6b89990f1c1eb88f1262 SHA512 31dfc2792d54813d1361f117bcd4a489a5e37e1a3ad1c6f811fc0e15b4bbfeb84f5d842dea2b8fcb08e503a51ad58ccc298da9bf86536abcfb5541e71b999806
 DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31
 DIST logstash-6.1.1.zip 116335093 BLAKE2B e7a990c2ea0eb3ec7de714f038765817c76eaf9e6cef0e55106f1f1aca406ec95d6be779f24c1fa28e096b51feeef968cb31f416f99c85c2f45d798bb74aadf7 SHA512 a2a420169dff31f3d5d65628a9d1eaad930a8e544fc4e986e3671ffeea3a1d03c8f77f8b51568a0da082588a843568fb7aefe29c1c90365882f429f9536f9240
-EBUILD logstash-bin-5.6.5.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
+DIST logstash-6.2.2.zip 146093122 BLAKE2B 0bd01673bb030593a944ecdd859ff0f44d8732f3ffef2b45b38798124c9caa547f625ae9c85300500683bac149b6ca4b9976bd0769fa0684989d40aa452a3584 SHA512 eb67b1fbe2530e4b24252a03aca572a41188e119cbf4a88267795782b347155f2e20405add6626585688fa6ed9d38fa463a0818fccd12612285950904dbd0cad
+EBUILD logstash-bin-5.6.8.ebuild 2200 BLAKE2B bf08e722dcd1ffc2ff38892c960d2c65407b00cc0ffd694f4ba443bce457f000e41c72c2d7d2d0c2961884d0c42a6e40feb6dad7f56c4339ec1f2ef5fb1a0c89 SHA512 21d8e0bf96cfb356e823e49ea4f5d6031f27055b9a95288cc9bf74989a7a7f9d4d8d88d0a5d89c3beb9badc2a76bd98cdfcd8cbbab110cd8da7dc544960bef10
 EBUILD logstash-bin-6.0.1.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
 EBUILD logstash-bin-6.1.1.ebuild 2203 BLAKE2B cd2127e338eead00002113add534ac31c23ac5578263ebcbd7ec96b9d234a82a50a86ec7c476596afc4c51ae51a0be434a89165138b7b1515a4fda4a8efd5aba SHA512 96e4e8391a149c4350d28c40f28efe652216171e4026be735df4aa48c1427e8e6f37fcb16720e288ca1d69bbbea6a3657db93f5bf3ef5d7a55b757296a5e2e68
+EBUILD logstash-bin-6.2.2.ebuild 2203 BLAKE2B cd2127e338eead00002113add534ac31c23ac5578263ebcbd7ec96b9d234a82a50a86ec7c476596afc4c51ae51a0be434a89165138b7b1515a4fda4a8efd5aba SHA512 96e4e8391a149c4350d28c40f28efe652216171e4026be735df4aa48c1427e8e6f37fcb16720e288ca1d69bbbea6a3657db93f5bf3ef5d7a55b757296a5e2e68
 MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049
diff --git a/app-admin/logstash-bin/logstash-bin-5.6.5.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.8.ebuild
index f5c2a9c0a255..b14f892c2844 100644
--- a/app-admin/logstash-bin/logstash-bin-5.6.5.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.6.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild b/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild
new file mode 100644
index 000000000000..1977b1915acb
--- /dev/null
+++ b/app-admin/logstash-bin/logstash-bin-6.2.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 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 -r 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}"
+}