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: Tue, 02 Oct 2018 09:40:23
Message-Id: 1538473178.9f73ba84803234c317fcfb1acbca62e90f97ce79.whissi@gentoo
1 commit: 9f73ba84803234c317fcfb1acbca62e90f97ce79
2 Author: Tomas Mozes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Tue Oct 2 09:39:37 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Tue Oct 2 09:39:38 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f73ba84
7
8 app-admin/logstash-bin: drop old
9
10 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
11 Package-Manager: Portage-2.3.50, Repoman-2.3.11
12 Closes: https://github.com/gentoo/gentoo/pull/10002
13 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
14
15 app-admin/logstash-bin/Manifest | 3 -
16 app-admin/logstash-bin/logstash-bin-5.6.11.ebuild | 77 -----------------------
17 app-admin/logstash-bin/logstash-bin-6.4.0.ebuild | 77 -----------------------
18 3 files changed, 157 deletions(-)
19
20 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
21 index 10cdad314ed..8cfce385f67 100644
22 --- a/app-admin/logstash-bin/Manifest
23 +++ b/app-admin/logstash-bin/Manifest
24 @@ -1,8 +1,5 @@
25 -DIST logstash-5.6.11.tar.gz 104371822 BLAKE2B 3597b8ef661fa2bcbfd112966b11789925b1fafdc11991390c96d62af02d959cc251c59f352a949b14760df9f5eda5672ff407b70b3f361d4ec7ce3379eb7e5d SHA512 1e8f78fd76f637672bf18ec4b986c56c76be357788364e4dc863933f28982b988b147f31e091381e960c010ee4791e6f79914a75bacfe6b0482e573272bba749
26 DIST logstash-5.6.12.tar.gz 104371301 BLAKE2B be7a2c7df807ae9ab738c1ec7693e23bd4491e14cc866e50b2a4d6b58466ce94801ccc6684c7d297a2d89faba67ba10d61b50b57c439a8b3ba3fa3a0752b4529 SHA512 39411a92eac34160a9b38914c08165ba789c5d16f76b1823dd08305581b18a668fb680b60c6be50fd59b2bb79bf7f507b39b42cc71ac0f5b9c5be597048f32a5
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-6.4.1.tar.gz 153922055 BLAKE2B 5a9c2852047e7a6a318eaa710d273cbfa172ae02c08a08b361a6f2bc48c5e46b3d7709652a51e3b0102fbf7c73ad179c18b6ed6a961bece53d009de065f13e5c SHA512 b496ed0746ee38a375a3efc5eb93677accb61c3482550a75cf9ad5e7b8e104eb8560bce79325ce85a27d22b664299edf1970452837189fcfa9310798c58825c1
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 DIST logstash-oss-6.4.1.tar.gz 153795059 BLAKE2B 1262fac2128bbbf1d172473ea8522ed2469a449d93eef4f3aefa6026e4347e2247ed03990164d72a9b8a01fa1c1b393207b7c5d73d82d20934ada78cefb5af64 SHA512 1192154eaa48cccbdefa4db7f08dce3a68066d5fd7a14cc3093d06c848efc5c4f1a87c873c43c4e17741be9e41c3de1f14ff41df7af2c3c4600a741fefc94b47
33
34 diff --git a/app-admin/logstash-bin/logstash-bin-5.6.11.ebuild b/app-admin/logstash-bin/logstash-bin-5.6.11.ebuild
35 deleted file mode 100644
36 index b52e9f6f7bf..00000000000
37 --- a/app-admin/logstash-bin/logstash-bin-5.6.11.ebuild
38 +++ /dev/null
39 @@ -1,77 +0,0 @@
40 -# Copyright 1999-2018 Gentoo Foundation
41 -# Distributed under the terms of the GNU General Public License v2
42 -
43 -EAPI=6
44 -
45 -inherit java-pkg-2 user
46 -
47 -MY_PN="${PN%-bin}"
48 -MY_P="${MY_PN}-${PV}"
49 -
50 -DESCRIPTION="Tool for managing events and logs"
51 -HOMEPAGE="https://www.elastic.co/products/logstash"
52 -SRC_URI="https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz"
53 -
54 -# source: LICENSE.txt and NOTICE.txt
55 -LICENSE="Apache-2.0 MIT"
56 -SLOT="0"
57 -KEYWORDS="~amd64"
58 -
59 -RESTRICT="strip"
60 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
61 -
62 -RDEPEND="virtual/jre:1.8"
63 -
64 -S="${WORKDIR}/${MY_P}"
65 -
66 -pkg_setup() {
67 - enewgroup ${MY_PN}
68 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
69 -}
70 -
71 -src_install() {
72 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
73 - keepdir "/var/lib/${MY_PN}"
74 - keepdir "/var/log/${MY_PN}"
75 -
76 - insinto "/usr/share/${MY_PN}"
77 - newins "${FILESDIR}/agent.conf.sample" agent.conf
78 -
79 - rm -v config/startup.options || die
80 - insinto /etc/${MY_PN}
81 - doins -r config/.
82 - rm -rv config data || die
83 -
84 - insinto "/opt/${MY_PN}"
85 - doins -r .
86 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
87 -
88 - newconfd "${FILESDIR}/${MY_PN}.confd-r1" "${MY_PN}"
89 - newinitd "${FILESDIR}/${MY_PN}.initd-r1" "${MY_PN}"
90 -
91 - insinto /usr/share/eselect/modules
92 - doins "${FILESDIR}"/logstash-plugin.eselect
93 -}
94 -
95 -pkg_postinst() {
96 - ewarn "The default pidfile directory has been changed from /run/logstash to /run."
97 - ewarn "Please ensure any running logstash processes are shut down cleanly."
98 - ewarn
99 - ewarn "The default data directory has been moved from /opt/logstash/data to"
100 - ewarn "/var/lib/logstash/data. Please check and move its contents as necessary."
101 - ewarn
102 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
103 - ewarn "Install the plugins via eselect module that will automatically re-install"
104 - ewarn "all self installed plugins after Logstash upgrades."
105 - elog
106 - elog "Installing plugins:"
107 - elog "eselect logstash-plugin install logstash-output-gelf"
108 - elog
109 -
110 - elog "Reinstalling self installed plugins (installed via eselect module):"
111 - eselect logstash-plugin reinstall
112 -
113 - elog
114 - elog "Sample configuration:"
115 - elog "${EROOT%/}/usr/share/${MY_PN}"
116 -}
117
118 diff --git a/app-admin/logstash-bin/logstash-bin-6.4.0.ebuild b/app-admin/logstash-bin/logstash-bin-6.4.0.ebuild
119 deleted file mode 100644
120 index acbb17a3c74..00000000000
121 --- a/app-admin/logstash-bin/logstash-bin-6.4.0.ebuild
122 +++ /dev/null
123 @@ -1,77 +0,0 @@
124 -# Copyright 1999-2018 Gentoo Foundation
125 -# Distributed under the terms of the GNU General Public License v2
126 -
127 -EAPI=6
128 -
129 -inherit java-pkg-2 user
130 -
131 -MY_PN="${PN%-bin}"
132 -MY_P="${MY_PN}-${PV}"
133 -
134 -DESCRIPTION="Tool for managing events and logs"
135 -HOMEPAGE="https://www.elastic.co/products/logstash"
136 -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
137 - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
138 -
139 -# source: LICENSE.txt and NOTICE.txt
140 -LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
141 -SLOT="0"
142 -KEYWORDS="~amd64"
143 -IUSE="x-pack"
144 -
145 -RESTRICT="strip"
146 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
147 -
148 -RDEPEND="virtual/jre:1.8"
149 -
150 -S="${WORKDIR}/${MY_P}"
151 -
152 -pkg_setup() {
153 - enewgroup ${MY_PN}
154 - enewuser ${MY_PN} -1 -1 /var/lib/${MY_PN} ${MY_PN}
155 -}
156 -
157 -src_install() {
158 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
159 - keepdir "/var/lib/${MY_PN}"
160 - keepdir "/var/log/${MY_PN}"
161 -
162 - insinto "/usr/share/${MY_PN}"
163 - newins "${FILESDIR}/agent.conf.sample" agent.conf
164 -
165 - rm -v config/{pipelines.yml,startup.options} || die
166 - insinto /etc/${MY_PN}
167 - doins -r config/.
168 - doins "${FILESDIR}/pipelines.yml"
169 - rm -rv config data || die
170 -
171 - insinto "/opt/${MY_PN}"
172 - doins -r .
173 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
174 -
175 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
176 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
177 -
178 - insinto /usr/share/eselect/modules
179 - doins "${FILESDIR}"/logstash-plugin.eselect
180 -}
181 -
182 -pkg_postinst() {
183 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
184 - ewarn "Install the plugins via eselect module that will automatically re-install"
185 - ewarn "all self installed plugins after Logstash upgrades."
186 - elog
187 - elog "Installing plugins:"
188 - elog "eselect logstash-plugin install logstash-output-gelf"
189 - elog
190 -
191 - elog "Reinstalling self installed plugins (installed via eselect module):"
192 - eselect logstash-plugin reinstall
193 -
194 - elog
195 - elog "Sample configuration:"
196 - elog "${EROOT%/}/usr/share/${MY_PN}"
197 - elog
198 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
199 - elog "${EROOT%/}/etc/logstash/conf.d/*.conf"
200 -}