Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/
Date: Tue, 12 Dec 2017 20:27:26
Message-Id: 1513110432.c8b0d731f94b98ce27f7fb693e9ec23128ab4098.monsieurp@gentoo
1 commit: c8b0d731f94b98ce27f7fb693e9ec23128ab4098
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Mon Dec 11 06:39:26 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 12 20:27:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b0d731
7
8 app-admin/logstash-bin: drop old.
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 app-admin/logstash-bin/Manifest | 2 -
13 app-admin/logstash-bin/logstash-bin-5.6.4.ebuild | 77 ------------------------
14 app-admin/logstash-bin/logstash-bin-6.0.0.ebuild | 77 ------------------------
15 3 files changed, 156 deletions(-)
16
17 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
18 index 238b9dd330e..1d5bd66e647 100644
19 --- a/app-admin/logstash-bin/Manifest
20 +++ b/app-admin/logstash-bin/Manifest
21 @@ -1,5 +1,3 @@
22 DIST logstash-5.5.3.zip 99551442 BLAKE2B ee29db9b606a3aae83c218d020fc8c17d19013411e3a0deb6c333489803f4d3d6809ac8806adf373e319888049826d0d4ce8f09ca6db3b1afdeb261321e349ba SHA512 a4328ad0b8192b7c5aaed155d608d9db6adeaefd640e461ef4467daa1a28a2ae25d6b2b1adcf47c5dd82b66fc1adbf8ba5f3eabcf7e69dd8719a5860795877aa
23 -DIST logstash-5.6.4.zip 109819435 BLAKE2B 63c7016c7fa38f92d2f6a43b9e3086014bc4d4fb67772d4156f8c9fb31bce7329e52734a30effca3fa9691bef81727be1c7da9b54bfc4ce97bc7487fe60a4862 SHA512 5382671758d905bbd89f9e05eff9ffcf4a3bbc4fca6f06844647c31df3f50198c297daa0151915c9ef1f0cd741ccb9fb12a7fa13cdc429463d92783c92624717
24 DIST logstash-5.6.5.zip 109135563 BLAKE2B 6846231439807dd4fc77ae86af849aaefcc9084482f2f88de6148da3d31ef583164da6749ebe0c4def83217e95729a933acbb3e04777db58639eaab91de06831 SHA512 f1dcbb8f67d2f2868e38646b56376428e0996cbf302837300939b8c7ff6d764417fccea40f90559c48441f939e6940e84501ee3ad1e29ad2538969f2cc12b2b8
25 -DIST logstash-6.0.0.zip 118915764 BLAKE2B fd99a2d73c0f7bc381154f197353cb8a5f55f8c278b8381207b3bbeac13dd7850ae4b994dbcc582324b11e7a9bfa6807bcaeebf5506b5234bc6ba0ad62009182 SHA512 9d830f5a88e51b5076af13cc2909fd42c7a75de9466fdd0e7379dff20e7f6d6bfd97b6005278222fb3ab020aa98a572023fc36a7f7cde2eaa4d9a1745f3c82b4
26 DIST logstash-6.0.1.zip 116215793 BLAKE2B 676810b9cd62f578e31e1d63d4aae8c920590905a7344434d5e14607bab0e3ce59e2740e6839491f44ce769b24330a7a060174dcb5e6cb9cf51a31d165ba990b SHA512 395e4e2ff199d9ffc5156901d6ba6ab17771ab8f8859acede74567b2294e2d7ee2a6693e79f7b3e82c8d5c1959ad259bfb22e7992670cdcd3b73c7b72a635a31
27
28 diff --git a/app-admin/logstash-bin/logstash-bin-5.6.4.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.4.ebuild
29 deleted file mode 100644
30 index f5c2a9c0a25..00000000000
31 --- a/app-admin/logstash-bin/logstash-bin-5.6.4.ebuild
32 +++ /dev/null
33 @@ -1,77 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -inherit java-pkg-2 user
40 -
41 -MY_PN="${PN%-bin}"
42 -MY_P="${MY_PN}-${PV}"
43 -
44 -DESCRIPTION="Tool for managing events and logs"
45 -HOMEPAGE="https://www.elastic.co/products/logstash"
46 -SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
47 -
48 -# source: LICENSE.txt and NOTICE.txt
49 -LICENSE="Apache-2.0 MIT"
50 -SLOT="0"
51 -KEYWORDS="~amd64"
52 -
53 -RESTRICT="strip"
54 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
55 -
56 -RDEPEND="virtual/jre:1.8"
57 -
58 -S="${WORKDIR}/${MY_P}"
59 -
60 -pkg_setup() {
61 - enewgroup ${MY_PN}
62 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
63 -}
64 -
65 -src_install() {
66 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
67 - keepdir "/var/lib/${MY_PN}"
68 - keepdir "/var/log/${MY_PN}"
69 -
70 - insinto "/usr/share/${MY_PN}"
71 - newins "${FILESDIR}/agent.conf.sample" agent.conf
72 -
73 - rm -v config/startup.options || die
74 - insinto /etc/${MY_PN}
75 - doins config/*
76 - rm -rv config data || die
77 -
78 - insinto "/opt/${MY_PN}"
79 - doins -r .
80 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
81 -
82 - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
83 - newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
84 -
85 - insinto /usr/share/eselect/modules
86 - doins "${FILESDIR}"/logstash-plugin.eselect
87 -}
88 -
89 -pkg_postinst() {
90 - ewarn "The default pidfile directory has been changed from /run/logstash to /run."
91 - ewarn "Please ensure any running logstash processes are shut down cleanly."
92 - ewarn
93 - ewarn "The default data directory has been moved from /opt/logstash/data to"
94 - ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
95 - ewarn
96 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
97 - ewarn "Install the plugins via eselect module that will automatically re-install"
98 - ewarn "all self installed plugins after Logstash upgrades."
99 - einfo
100 - einfo "Installing plugins:"
101 - einfo "eselect logstash-plugin install logstash-output-gelf"
102 - einfo
103 -
104 - einfo "Reinstalling self installed plugins (installed via eselect module):"
105 - eselect logstash-plugin reinstall
106 -
107 - einfo
108 - einfo "Sample configuration:"
109 - einfo "${EROOT%/}/usr/share/${MY_PN}"
110 -}
111
112 diff --git a/app-admin/logstash-bin/logstash-bin-6.0.0.ebuild b/app-admin/logstash-bin/logstash-bin-6.0.0.ebuild
113 deleted file mode 100644
114 index f5c2a9c0a25..00000000000
115 --- a/app-admin/logstash-bin/logstash-bin-6.0.0.ebuild
116 +++ /dev/null
117 @@ -1,77 +0,0 @@
118 -# Copyright 1999-2017 Gentoo Foundation
119 -# Distributed under the terms of the GNU General Public License v2
120 -
121 -EAPI=6
122 -
123 -inherit java-pkg-2 user
124 -
125 -MY_PN="${PN%-bin}"
126 -MY_P="${MY_PN}-${PV}"
127 -
128 -DESCRIPTION="Tool for managing events and logs"
129 -HOMEPAGE="https://www.elastic.co/products/logstash"
130 -SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
131 -
132 -# source: LICENSE.txt and NOTICE.txt
133 -LICENSE="Apache-2.0 MIT"
134 -SLOT="0"
135 -KEYWORDS="~amd64"
136 -
137 -RESTRICT="strip"
138 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
139 -
140 -RDEPEND="virtual/jre:1.8"
141 -
142 -S="${WORKDIR}/${MY_P}"
143 -
144 -pkg_setup() {
145 - enewgroup ${MY_PN}
146 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
147 -}
148 -
149 -src_install() {
150 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
151 - keepdir "/var/lib/${MY_PN}"
152 - keepdir "/var/log/${MY_PN}"
153 -
154 - insinto "/usr/share/${MY_PN}"
155 - newins "${FILESDIR}/agent.conf.sample" agent.conf
156 -
157 - rm -v config/startup.options || die
158 - insinto /etc/${MY_PN}
159 - doins config/*
160 - rm -rv config data || die
161 -
162 - insinto "/opt/${MY_PN}"
163 - doins -r .
164 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
165 -
166 - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
167 - newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
168 -
169 - insinto /usr/share/eselect/modules
170 - doins "${FILESDIR}"/logstash-plugin.eselect
171 -}
172 -
173 -pkg_postinst() {
174 - ewarn "The default pidfile directory has been changed from /run/logstash to /run."
175 - ewarn "Please ensure any running logstash processes are shut down cleanly."
176 - ewarn
177 - ewarn "The default data directory has been moved from /opt/logstash/data to"
178 - ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
179 - ewarn
180 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
181 - ewarn "Install the plugins via eselect module that will automatically re-install"
182 - ewarn "all self installed plugins after Logstash upgrades."
183 - einfo
184 - einfo "Installing plugins:"
185 - einfo "eselect logstash-plugin install logstash-output-gelf"
186 - einfo
187 -
188 - einfo "Reinstalling self installed plugins (installed via eselect module):"
189 - eselect logstash-plugin reinstall
190 -
191 - einfo
192 - einfo "Sample configuration:"
193 - einfo "${EROOT%/}/usr/share/${MY_PN}"
194 -}