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: Thu, 30 Jul 2020 18:17:20
Message-Id: 1596133008.dabc6361680aec675f1d38c204f91f4f8fe4d989.whissi@gentoo
1 commit: dabc6361680aec675f1d38c204f91f4f8fe4d989
2 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 29 19:39:00 2020 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 18:16:48 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dabc6361
7
8 app-admin/logstash-bin: drop old
9
10 Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
11 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
12
13 app-admin/logstash-bin/Manifest | 4 --
14 app-admin/logstash-bin/logstash-bin-6.8.8.ebuild | 73 ------------------------
15 app-admin/logstash-bin/logstash-bin-7.8.0.ebuild | 73 ------------------------
16 3 files changed, 150 deletions(-)
17
18 diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest
19 index 226a2417fc2..3cfaa0c0541 100644
20 --- a/app-admin/logstash-bin/Manifest
21 +++ b/app-admin/logstash-bin/Manifest
22 @@ -1,12 +1,8 @@
23 DIST logstash-6.8.11.tar.gz 176909941 BLAKE2B f3a7085b179215982df87433523735dab35832ae73a41b8b98a66dacc95bd79985f14f78699902c3b7153ff7c11d21ea3f150899095790ad888bdfbb2eaa6fda SHA512 0ebb938784a4a4ea8c1e1691d1953d69605860b6b61fb818d73054b4488fd4c43914c369b468948633ea52d2c8c4f0bfe0e610912cb8c7436b15c5ac5a7047d6
24 -DIST logstash-6.8.8.tar.gz 179965893 BLAKE2B a56db7b09c7fd59a5496e076ab11bf273265cff7eedfc9c9dfaa117a16baeb9b9c8e97a71eb8ff2a80f379b242d08c2d997476d7a48bab802ff3380d8914f13c SHA512 11c0b9be1d51c3feff82181234d0b5cd838edff78678bdc410f306c52d6345393e9d6c4d6095c2e3aa044f8c5af35d98fa2570891e81e9e3c57907c2baed6100
25 DIST logstash-7.6.2.tar.gz 172679447 BLAKE2B afeaab06178669559ff532cf72575f8063d07f95f2401060d33e0a99c87bb9e0c251e45634b9723efe456892ac19586accc89cf7272163e48eeaef438632b777 SHA512 c86dcf36cd0d578467c7013234040d5ea100f08ef69a185f6aa86c87dfa46936282abf10d0f495ffe649274136b735d17ab513ef3401205140c2d98bd9f91238
26 DIST logstash-7.7.0.tar.gz 166451553 BLAKE2B 30b732f1ef516b275246b0e14212b0b00b78502e0b4e78211b3bfdd77e2190639ed8c35f775dae7817b0b43a446d34941b968e8a0785302c337a326a507fc607 SHA512 970740adc47551d7967b9841cc39d15f2cbdcd46c2fee1f84b5688fac266fdcd2202cbb10d3a10cf3768606f693ed2e4fc79e91d293a3295083718bafaa7bc9d
27 -DIST logstash-7.8.0.tar.gz 167162975 BLAKE2B 666746571151b1cc1b79fc7405235a107f452c4741ba0e65f151e8b38934239e57698faed3663889d932eabf43e58277a1b2d5aebbf8dfa8c3f5e77fa8778ed2 SHA512 8b7c9015edfde0bed43a2668bf24d8523f785ea8f94b522e5d9dd886a677459f2c2c2e103b91b04f671287177e902e8f3fbf6747841f7984357a803405f9ed00
28 DIST logstash-7.8.1.tar.gz 159599529 BLAKE2B c7ba03fc106add6ee0b956de1c3a1ed221c2571087aeedec178d65be3cc83a10f7a4eb35898fc441ffd1c27322668d8e95344a5509cc703b4788d76422a5a1f1 SHA512 7ad6d380e92e90fad2a058a24571b85a49d5ed81835837c12dfa2f4ae4c776483de39b099ed6852ca7f4bab833cd5aba44d28df3048557dfc4a52d4c5486e276
29 DIST logstash-oss-6.8.11.tar.gz 176779121 BLAKE2B 2b3f62fd78a5ffcea07954c4e9b90fc7df10b933a327ac5400d73eb6c4ecd1013049d04b6cecd014b17ff6361a4be0ee535112267cce71cf8c9dc95b551ed6f6 SHA512 4e0d6ebaa620ebb0039687859f28e8620e5604d8452ad1338b2a670cec3153e521f4c3bdc3a78e10b843c1356e73c96065c1c624efc2baa9b2277fa1f8cabaa9
30 -DIST logstash-oss-6.8.8.tar.gz 179836007 BLAKE2B e278d8dd34341bceb506accb3424b4af6db0795b582e1370d60f4a4b68671372449c94ae28f4a7585b8d4f4e63dcf7d6fa80eed37fd4ef8e872414ae2cd15b80 SHA512 ceba8d798c1246c9fd3385bc4b64995fcf9083dc5149211fabc09bfa3208d56bba6d8ae4ab73da5f9968633f30c547e0132f76543e2f9a2a96675ee58df74b09
31 DIST logstash-oss-7.6.2.tar.gz 172501347 BLAKE2B 2a83d7617c8e13a0b736ed0023a164d2191102f49e7d7174bf3ea9c56370c51e4fd760f7bb3aba97f1b9bd2ec122ba22e00dec9ac9636f7b79128c6bb2da548e SHA512 c425a9748964ef38fc58f67778cd88fc367df91087362353cfee316e54528e4a23407e1fc53d628008fd4c829b427061758112f10e7805cec88c0a1f0a966d2a
32 DIST logstash-oss-7.7.0.tar.gz 166272505 BLAKE2B a12b065874e03ae985c590b8bcbaabf4d2ee6d0ce3ca1f5d60b0874074996e7f8c40bad4fd242e26e74c11741620103e41bdeade2f60f6fabe97652d1c9fbb1e SHA512 a455fcf5c9a44c326ae581f9390ddf206064e6e6b3801cca312cef91e8d33086f8a6598ed68f81f2cfc6d8d66783632b983bef7c8a4ad0f24e929827ec137da4
33 -DIST logstash-oss-7.8.0.tar.gz 166982219 BLAKE2B e0d6b500184523e1bb2e52fae6971e12bd7a547796508d4eb6883ffb16e41676a807eb7b228e8e2a64c9b7b5b9e375b2acebe15a0dc77e502707350e43390795 SHA512 4413ed97527eb89da3462cc401b84f4770bfb9e3e3083fb314b8ac813165655752a204f091512de3507527bf8cbea5934f67ada446448802424dd441da2d475e
34 DIST logstash-oss-7.8.1.tar.gz 159415077 BLAKE2B b6dd108679d813cf4ba0d0426ea8acfb460cdcfeec052359a6ce79f194fe4631349973ce1bc726fe7356264211608328204332c74e49ba0aa92e626571789142 SHA512 60d964c0b1f6afebcd41a8036e2dbbee62ca15365c840a5664406428c6b692588ea9343a600ba12d4355ff46ae60a08d42c61c5f33bb7590ce119e15fa1a32e4
35
36 diff --git a/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
37 deleted file mode 100644
38 index 08167fb0287..00000000000
39 --- a/app-admin/logstash-bin/logstash-bin-6.8.8.ebuild
40 +++ /dev/null
41 @@ -1,73 +0,0 @@
42 -# Copyright 1999-2020 Gentoo Authors
43 -# Distributed under the terms of the GNU General Public License v2
44 -
45 -EAPI=7
46 -
47 -inherit java-pkg-2
48 -
49 -MY_PN="${PN%-bin}"
50 -MY_P="${MY_PN}-${PV}"
51 -
52 -DESCRIPTION="Tool for managing events and logs"
53 -HOMEPAGE="https://www.elastic.co/products/logstash"
54 -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
55 - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
56 -
57 -# source: LICENSE.txt and NOTICE.txt
58 -LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
59 -SLOT="0"
60 -KEYWORDS="~amd64"
61 -IUSE="x-pack"
62 -
63 -RESTRICT="strip"
64 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
65 -
66 -RDEPEND="acct-group/logstash
67 - acct-user/logstash
68 - virtual/jre:1.8"
69 -
70 -S="${WORKDIR}/${MY_P}"
71 -
72 -src_install() {
73 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
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/{pipelines.yml,startup.options} || die
80 - insinto /etc/${MY_PN}
81 - doins -r config/.
82 - doins "${FILESDIR}/pipelines.yml"
83 - rm -rv config data || die
84 -
85 - insinto "/opt/${MY_PN}"
86 - doins -r .
87 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
88 -
89 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
90 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
91 -
92 - insinto /usr/share/eselect/modules
93 - doins "${FILESDIR}"/logstash-plugin.eselect
94 -}
95 -
96 -pkg_postinst() {
97 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
98 - ewarn "Install the plugins via eselect module that will automatically re-install"
99 - ewarn "all self installed plugins after Logstash upgrades."
100 - elog
101 - elog "Installing plugins:"
102 - elog "eselect logstash-plugin install logstash-output-gelf"
103 - elog
104 -
105 - elog "Reinstalling self installed plugins (installed via eselect module):"
106 - eselect logstash-plugin reinstall
107 -
108 - elog
109 - elog "Sample configuration:"
110 - elog "${EROOT}/usr/share/${MY_PN}"
111 - elog
112 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
113 - elog "${EROOT}/etc/logstash/conf.d/*.conf"
114 -}
115
116 diff --git a/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild b/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild
117 deleted file mode 100644
118 index 9e7d19873de..00000000000
119 --- a/app-admin/logstash-bin/logstash-bin-7.8.0.ebuild
120 +++ /dev/null
121 @@ -1,73 +0,0 @@
122 -# Copyright 1999-2020 Gentoo Authors
123 -# Distributed under the terms of the GNU General Public License v2
124 -
125 -EAPI=7
126 -
127 -inherit java-pkg-2
128 -
129 -MY_PN="${PN%-bin}"
130 -MY_P="${MY_PN}-${PV}"
131 -
132 -DESCRIPTION="Tool for managing events and logs"
133 -HOMEPAGE="https://www.elastic.co/products/logstash"
134 -SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz )
135 - !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )"
136 -
137 -# source: LICENSE.txt and NOTICE.txt
138 -LICENSE="Apache-2.0 MIT x-pack? ( Elastic )"
139 -SLOT="0"
140 -KEYWORDS="~amd64"
141 -IUSE="x-pack"
142 -
143 -RESTRICT="strip"
144 -QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so"
145 -
146 -RDEPEND="acct-group/logstash
147 - acct-user/logstash
148 - virtual/jre"
149 -
150 -S="${WORKDIR}/${MY_P}"
151 -
152 -src_install() {
153 - keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins}
154 - keepdir "/var/log/${MY_PN}"
155 -
156 - insinto "/usr/share/${MY_PN}"
157 - newins "${FILESDIR}/agent.conf.sample" agent.conf
158 -
159 - rm -v config/{pipelines.yml,startup.options} || die
160 - insinto /etc/${MY_PN}
161 - doins -r config/.
162 - doins "${FILESDIR}/pipelines.yml"
163 - rm -rv config data || die
164 -
165 - insinto "/opt/${MY_PN}"
166 - doins -r .
167 - fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin"
168 -
169 - newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}"
170 - newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}"
171 -
172 - insinto /usr/share/eselect/modules
173 - doins "${FILESDIR}"/logstash-plugin.eselect
174 -}
175 -
176 -pkg_postinst() {
177 - ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)"
178 - ewarn "Install the plugins via eselect module that will automatically re-install"
179 - ewarn "all self installed plugins after Logstash upgrades."
180 - elog
181 - elog "Installing plugins:"
182 - elog "eselect logstash-plugin install logstash-output-gelf"
183 - elog
184 -
185 - elog "Reinstalling self installed plugins (installed via eselect module):"
186 - eselect logstash-plugin reinstall
187 -
188 - elog
189 - elog "Sample configuration:"
190 - elog "${EROOT}/usr/share/${MY_PN}"
191 - elog
192 - elog "The default pipeline configuration expects the configuration(s) to be found in:"
193 - elog "${EROOT}/etc/logstash/conf.d/*.conf"
194 -}