Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/logstash-bin/
Date: Sun, 09 Sep 2018 20:41:38
Message-Id: 1536525674.93c218dbcb977af2ae815f8577e781abeddc5c9f.whissi@gentoo
1 commit: 93c218dbcb977af2ae815f8577e781abeddc5c9f
2 Author: Tomas Mozes <tmozes <AT> sygic <DOT> com>
3 AuthorDate: Sun Sep 9 20:07:51 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 9 20:41:14 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c218db
7
8 app-admin/logstash-bin: drop old
9
10 Closes: https://github.com/gentoo/gentoo/pull/9799
11 Package-Manager: Portage-2.3.49, Repoman-2.3.10
12
13 app-admin/logstash-bin/Manifest | 3 -
14 app-admin/logstash-bin/logstash-bin-5.6.10.ebuild | 77 ----------------------
15 app-admin/logstash-bin/logstash-bin-6.2.4.ebuild | 78 -----------------------
16 app-admin/logstash-bin/logstash-bin-6.3.1.ebuild | 75 ----------------------
17 4 files changed, 233 deletions(-)
18
19 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
20 index 714cb8a98cf..3a273d715b7 100644
21 --- a/app-admin/logstash-bin/Manifest
22 +++ b/app-admin/logstash-bin/Manifest
23 @@ -1,8 +1,5 @@
24 -DIST logstash-5.6.10.tar.gz 104373711 BLAKE2B 759bf003e1799aeaef0a1279b3c7cf5732126ae65e9ca0a3e315cb6f7a1b4e4417fad1fd86328a58be99e04e8053264d873b04cf43cac2b49490bbdc82c8e8b7 SHA512 9ba887da982755efd21b363e9c084660c9b7e6c042e00a8c599f60d6bba5621af7ede43957f6c3d976888f4c13e6ae17cc69afd184f2dcdd41a311972f59a745
25 DIST logstash-5.6.11.tar.gz 104371822 BLAKE2B 3597b8ef661fa2bcbfd112966b11789925b1fafdc11991390c96d62af02d959cc251c59f352a949b14760df9f5eda5672ff407b70b3f361d4ec7ce3379eb7e5d SHA512 1e8f78fd76f637672bf18ec4b986c56c76be357788364e4dc863933f28982b988b147f31e091381e960c010ee4791e6f79914a75bacfe6b0482e573272bba749
26 -DIST logstash-6.2.4.zip 153969993 BLAKE2B 989f631484be14014b8230e09fa049a0e470078fed938f2df55134a27d5f4f2d8670187126d32c4933b77b496a6ed96e12d180922c2c318c67fb3dbeec5a5a3b SHA512 65f6e5accc4441cb930e5c45723edeea54ba034a25680ca34114296af5a2c456d4152f9b38469475e600fce27a27b0d9c1d206039d12f2ec9cfeb02942a5c189
27 DIST logstash-6.3.2.tar.gz 144211416 BLAKE2B 8471fd0a920b4ef06cd775ceaafde33e16e5d1898c89339f4a039262a7a6472d6cb8dd2017db8811d6a827395a5b1e7040d9759c8734de2ccd1fc7e615345813 SHA512 11507b9177aa6cd4172eb825e395571de71bae8b0e39d7f700fe27c7219b22bc2b9a493e39016eead2d54407dc5e5cc20a0c6e4453140d628cadea076453308f
28 DIST logstash-6.4.0.tar.gz 153887188 BLAKE2B 36f6181d8f8e9c9d9a9f919c66c909fd3008d41b2de9bf014738ba6f3bd8f08204c2acc12c32a4978421476ddc45dc01269d8b145c2d863304d942a24b02a520 SHA512 6cb47370c757151fd7e2eed03b05d28492bfc0f5d397cf885ee6814965a83884716b39d3c9360341c3d4d029dc60d61502453defd42cc072c5ad3756bc2c654f
29 -DIST logstash-oss-6.3.1.tar.gz 143787612 BLAKE2B 2de3b991d27019b1c7df7cfa7152c009f2569e12562106babb56081be2a7ac7d94a967e7c52b58f721c2f70f1e8ec9c2730653ff094cf0dd3a9933486ac13be7 SHA512 959d9d5985e117d23ae12efe248a13ae33f8f3ede320fb3b6872e1c27738b601779f0e2402e7be4a2383cd0f220e50cdfd2d6b160d7f5805b2439cee4d8bd94c
30 DIST logstash-oss-6.3.2.tar.gz 144128583 BLAKE2B 99de9d375a06d132844ce63fa5d0e092bb05aedb93ff5e4a278ea75ca2fe68701afa3028af4f9c3e5b3b469e46faf4d6dc62d006e9dac3a9e9528ff94aa2dd47 SHA512 7fa97f0ca070677aaddc73ff900397ce4a45f4b02467917219acb3c414cf0cbf396b481f624d2ebc3f370b2e41120b3b103f6d080a9fafdce98b119eb8d27f5d
31 DIST logstash-oss-6.4.0.tar.gz 153760331 BLAKE2B 7e519d9666d5fb98079c5eb721b1a4f721fbf0c871919d115e67ff00111d25184abf37bdcb3cacb1bc3eccbc779cc15a9324f72d5e02337ab6993a0d1a9dab18 SHA512 2261cffdb6ee7eba08d381f243e534b8d756c760ac40a5707a3abb4adca08c02c403a8c204dab2091bb46bb4be52b938867675041c49a25e3b1c98fb07f92b98
32
33 diff --git a/app-admin/logstash-bin/logstash-bin-5.6.10.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.10.ebuild
34 deleted file mode 100644
35 index b52e9f6f7bf..00000000000
36 --- a/app-admin/logstash-bin/logstash-bin-5.6.10.ebuild
37 +++ /dev/null
38 @@ -1,77 +0,0 @@
39 -# Copyright 1999-2018 Gentoo Foundation
40 -# Distributed under the terms of the GNU General Public License v2
41 -
42 -EAPI=6
43 -
44 -inherit java-pkg-2 user
45 -
46 -MY_PN="${PN%-bin}"
47 -MY_P="${MY_PN}-${PV}"
48 -
49 -DESCRIPTION="Tool for managing events and logs"
50 -HOMEPAGE="https://www.elastic.co/products/logstash"
51 -SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz"
52 -
53 -# source: LICENSE.txt and NOTICE.txt
54 -LICENSE="Apache-2.0 MIT"
55 -SLOT="0"
56 -KEYWORDS="~amd64"
57 -
58 -RESTRICT="strip"
59 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
60 -
61 -RDEPEND="virtual/jre:1.8"
62 -
63 -S="${WORKDIR}/${MY_P}"
64 -
65 -pkg_setup() {
66 - enewgroup ${MY_PN}
67 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
68 -}
69 -
70 -src_install() {
71 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
72 - keepdir "/var/lib/${MY_PN}"
73 - keepdir "/var/log/${MY_PN}"
74 -
75 - insinto "/usr/share/${MY_PN}"
76 - newins "${FILESDIR}/agent.conf.sample" agent.conf
77 -
78 - rm -v config/startup.options || die
79 - insinto /etc/${MY_PN}
80 - doins -r config/.
81 - rm -rv config data || die
82 -
83 - insinto "/opt/${MY_PN}"
84 - doins -r .
85 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
86 -
87 - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
88 - newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
89 -
90 - insinto /usr/share/eselect/modules
91 - doins "${FILESDIR}"/logstash-plugin.eselect
92 -}
93 -
94 -pkg_postinst() {
95 - ewarn "The default pidfile directory has been changed from /run/logstash to /run."
96 - ewarn "Please ensure any running logstash processes are shut down cleanly."
97 - ewarn
98 - ewarn "The default data directory has been moved from /opt/logstash/data to"
99 - ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
100 - ewarn
101 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
102 - ewarn "Install the plugins via eselect module that will automatically re-install"
103 - ewarn "all self installed plugins after Logstash upgrades."
104 - elog
105 - elog "Installing plugins:"
106 - elog "eselect logstash-plugin install logstash-output-gelf"
107 - elog
108 -
109 - elog "Reinstalling self installed plugins (installed via eselect module):"
110 - eselect logstash-plugin reinstall
111 -
112 - elog
113 - elog "Sample configuration:"
114 - elog "${EROOT%/}/usr/share/${MY_PN}"
115 -}
116
117 diff --git a/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild b/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild
118 deleted file mode 100644
119 index d1ce6cfb92d..00000000000
120 --- a/app-admin/logstash-bin/logstash-bin-6.2.4.ebuild
121 +++ /dev/null
122 @@ -1,78 +0,0 @@
123 -# Copyright 1999-2018 Gentoo Foundation
124 -# Distributed under the terms of the GNU General Public License v2
125 -
126 -EAPI=6
127 -
128 -inherit java-pkg-2 user
129 -
130 -MY_PN="${PN%-bin}"
131 -MY_P="${MY_PN}-${PV}"
132 -
133 -DESCRIPTION="Tool for managing events and logs"
134 -HOMEPAGE="https://www.elastic.co/products/logstash"
135 -SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.zip"
136 -
137 -# source: LICENSE.txt and NOTICE.txt
138 -LICENSE="Apache-2.0 MIT"
139 -SLOT="0"
140 -KEYWORDS="~amd64"
141 -
142 -RESTRICT="strip"
143 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
144 -
145 -DEPEND="app-arch/unzip"
146 -RDEPEND="virtual/jre:1.8"
147 -
148 -S="${WORKDIR}/${MY_P}"
149 -
150 -pkg_setup() {
151 - enewgroup ${MY_PN}
152 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
153 -}
154 -
155 -src_install() {
156 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
157 - keepdir "/var/lib/${MY_PN}"
158 - keepdir "/var/log/${MY_PN}"
159 -
160 - insinto "/usr/share/${MY_PN}"
161 - newins "${FILESDIR}/agent.conf.sample" agent.conf
162 -
163 - rm -v config/startup.options || die
164 - insinto /etc/${MY_PN}
165 - doins -r config/.
166 - rm -rv config data || die
167 -
168 - insinto "/opt/${MY_PN}"
169 - doins -r .
170 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
171 -
172 - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
173 - newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
174 -
175 - insinto /usr/share/eselect/modules
176 - doins "${FILESDIR}"/logstash-plugin.eselect
177 -}
178 -
179 -pkg_postinst() {
180 - ewarn "The default pidfile directory has been changed from /run/logstash to /run."
181 - ewarn "Please ensure any running logstash processes are shut down cleanly."
182 - ewarn
183 - ewarn "The default data directory has been moved from /opt/logstash/data to"
184 - ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
185 - ewarn
186 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
187 - ewarn "Install the plugins via eselect module that will automatically re-install"
188 - ewarn "all self installed plugins after Logstash upgrades."
189 - elog
190 - elog "Installing plugins:"
191 - elog "eselect logstash-plugin install logstash-output-gelf"
192 - elog
193 -
194 - elog "Reinstalling self installed plugins (installed via eselect module):"
195 - eselect logstash-plugin reinstall
196 -
197 - elog
198 - elog "Sample configuration:"
199 - elog "${EROOT%/}/usr/share/${MY_PN}"
200 -}
201
202 diff --git a/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild b/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild
203 deleted file mode 100644
204 index a5c02ab91f8..00000000000
205 --- a/app-admin/logstash-bin/logstash-bin-6.3.1.ebuild
206 +++ /dev/null
207 @@ -1,75 +0,0 @@
208 -# Copyright 1999-2018 Gentoo Foundation
209 -# Distributed under the terms of the GNU General Public License v2
210 -
211 -EAPI=6
212 -
213 -inherit java-pkg-2 user
214 -
215 -MY_PN="${PN%-bin}"
216 -MY_P="${MY_PN}-${PV}"
217 -
218 -DESCRIPTION="Tool for managing events and logs"
219 -HOMEPAGE="https://www.elastic.co/products/logstash"
220 -SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz"
221 -
222 -# source: LICENSE.txt and NOTICE.txt
223 -LICENSE="Apache-2.0 MIT"
224 -SLOT="0"
225 -KEYWORDS="~amd64"
226 -
227 -RESTRICT="strip"
228 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
229 -
230 -RDEPEND="virtual/jre:1.8"
231 -
232 -S="${WORKDIR}/${MY_P}"
233 -
234 -pkg_setup() {
235 - enewgroup ${MY_PN}
236 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
237 -}
238 -
239 -src_install() {
240 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
241 - keepdir "/var/lib/${MY_PN}"
242 - keepdir "/var/log/${MY_PN}"
243 -
244 - insinto "/usr/share/${MY_PN}"
245 - newins "${FILESDIR}/agent.conf.sample" agent.conf
246 -
247 - rm -v config/{pipelines.yml,startup.options} || die
248 - insinto /etc/${MY_PN}
249 - doins -r config/.
250 - doins "${FILESDIR}/pipelines.yml"
251 - rm -rv config data || die
252 -
253 - insinto "/opt/${MY_PN}"
254 - doins -r .
255 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
256 -
257 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
258 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
259 -
260 - insinto /usr/share/eselect/modules
261 - doins "${FILESDIR}"/logstash-plugin.eselect
262 -}
263 -
264 -pkg_postinst() {
265 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
266 - ewarn "Install the plugins via eselect module that will automatically re-install"
267 - ewarn "all self installed plugins after Logstash upgrades."
268 - elog
269 - elog "Installing plugins:"
270 - elog "eselect logstash-plugin install logstash-output-gelf"
271 - elog
272 -
273 - elog "Reinstalling self installed plugins (installed via eselect module):"
274 - eselect logstash-plugin reinstall
275 -
276 - elog
277 - elog "Sample configuration:"
278 - elog "${EROOT%/}/usr/share/${MY_PN}"
279 - elog
280 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
281 - elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
282 -}