summaryrefslogtreecommitdiff
path: root/app-admin/logstash-bin
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-02-03 08:30:30 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-02-03 08:30:30 +0000
commiteaab68ba6a05bc57d98ca12032440835ef905326 (patch)
tree722637b4f6d0087c5b321ceb515a98913bee7559 /app-admin/logstash-bin
parent4650985dd0e898b82e0d2ec225931297d4fadccf (diff)
gentoo resync : 03.02.2018
Diffstat (limited to 'app-admin/logstash-bin')
-rw-r--r--app-admin/logstash-bin/Manifest4
-rw-r--r--app-admin/logstash-bin/logstash-bin-6.1.1.ebuild (renamed from app-admin/logstash-bin/logstash-bin-5.5.3.ebuild)16
2 files changed, 11 insertions, 9 deletions
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
index 114ac021b04a..6c9d6eed086f 100644
--- a/app-admin/logstash-bin/Manifest
+++ b/app-admin/logstash-bin/Manifest
@@ -5,10 +5,10 @@ AUX logstash.confd-r1 837 BLAKE2B dd8362a386c865b44e05dd4a244146c5b593e4497d876c
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 BLAKE2B ee29db9b606a3aae83c218d020fc8c17d19013411e3a0deb6c333489803f4d3d6809ac8806adf373e319888049826d0d4ce8f09ca6db3b1afdeb261321e349ba SHA512 a4328ad0b8192b7c5aaed155d608d9db6adeaefd640e461ef4467daa1a28a2ae25d6b2b1adcf47c5dd82b66fc1adbf8ba5f3eabcf7e69dd8719a5860795877aa
DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8
DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31
-EBUILD logstash-bin-5.5.3.ebuild 2158 BLAKE2B 78605e21a12f389c8a9c771a9dbf2fdf0f49224c0966f378699d2c8da92f0c5375e99102629dd21e6103da7c487e0a19d447dd2541b3a28cb746a23ab912a0cd SHA512 e756ea562c886d1f4d1f1196a683eb17ef7f36de2dc04ca61d9f8f10bb458b779efe00c4a8c2d24360a99fc0691ffc3c509d8ef2da1d7a8d8d83b5aced7d8dca
+DIST logstash-6.1.1.zip 116335093 BLAKE2B e7a990c2ea0eb3ec7de714f038765817c76eaf9e6cef0e55106f1f1aca406ec95d6be779f24c1fa28e096b51feeef968cb31f416f99c85c2f45d798bb74aadf7 SHA512 a2a420169dff31f3d5d65628a9d1eaad930a8e544fc4e986e3671ffeea3a1d03c8f77f8b51568a0da082588a843568fb7aefe29c1c90365882f429f9536f9240
EBUILD logstash-bin-5.6.5.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
EBUILD logstash-bin-6.0.1.ebuild 2200 BLAKE2B 47aea0d24f81032ada30e99c70553d95c2faae35814299ae3ec25bf033f3bc06b94720ace62dfbb902be4a5d0c45ddc150683e152a1eaa044e8e589c5ace60b0 SHA512 acb1cbb0cfd64c21f656f98d065e68fb2803f99035c195d13e670619f4f847da92115e3ccb48bae2635827fcaba7324ca81f1f0ecb4dcd258bf41b2df9e79f85
+EBUILD logstash-bin-6.1.1.ebuild 2203 BLAKE2B cd2127e338eead00002113add534ac31c23ac5578263ebcbd7ec96b9d234a82a50a86ec7c476596afc4c51ae51a0be434a89165138b7b1515a4fda4a8efd5aba SHA512 96e4e8391a149c4350d28c40f28efe652216171e4026be735df4aa48c1427e8e6f37fcb16720e288ca1d69bbbea6a3657db93f5bf3ef5d7a55b757296a5e2e68
MISC metadata.xml 578 BLAKE2B 739149a851fd22460a5cf86deaa74732e44ef44c9edfcba880e7734a8660c92d18df33728939addff8e95241c0475cafed5b0df77d0b9acde609b163f8e7eb0f SHA512 ce9ff07c8fa8edf104692b2736dd7e1a4b2d456dfd2f2cebc2a3dec28d7c11020abf21dad583663266ed5ab26670959bd4650a411524581019e0b27504fba049
diff --git a/app-admin/logstash-bin/logstash-bin-5.5.3.ebuild b/app-admin/logstash-bin/logstash-bin-6.1.1.ebuild
index 0c945e550909..1977b1915acb 100644
--- a/app-admin/logstash-bin/logstash-bin-5.5.3.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-6.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit user
+inherit java-pkg-2 user
MY_PN="${PN%-bin}"
MY_P="${MY_PN}-${PV}"
@@ -37,15 +37,17 @@ src_install() {
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"
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-
- newconfd "${FILESDIR}/${MY_PN}.confd" "${MY_PN}"
- newinitd "${FILESDIR}/${MY_PN}.initd" "${MY_PN}"
+ 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