1 |
commit: 115e3cec7eee8c2e083c9d46d4a76128055ee3a3 |
2 |
Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jan 28 08:03:49 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jan 28 08:36:26 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=115e3cec |
7 |
|
8 |
app-admin/logstash-bin: drop old |
9 |
|
10 |
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com> |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
app-admin/logstash-bin/Manifest | 4 -- |
14 |
app-admin/logstash-bin/logstash-bin-6.8.22.ebuild | 73 ------------------- |
15 |
app-admin/logstash-bin/logstash-bin-7.16.2.ebuild | 88 ----------------------- |
16 |
3 files changed, 165 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/logstash-bin/Manifest b/app-admin/logstash-bin/Manifest |
19 |
index 3af0e7b7546b..185b32e15b9f 100644 |
20 |
--- a/app-admin/logstash-bin/Manifest |
21 |
+++ b/app-admin/logstash-bin/Manifest |
22 |
@@ -1,8 +1,4 @@ |
23 |
-DIST logstash-6.8.22.tar.gz 178580688 BLAKE2B f75b00b93532ee680623abdd63e05bf6453e09850863a71d8c7ea71505f172b3151a258d2f08846cc3866fe38aa8da27dfdac2fa2ebb218862711f08efa46365 SHA512 f9f32f5a769c1d9fb46e453d758539f4bb3256cf3891f626dd8613d4673e244bfe90299208f3086b02d388825c73331764f9e95914563fb0b8bf7b7963d5ecfd |
24 |
DIST logstash-6.8.23.tar.gz 178007697 BLAKE2B d7ba85a141586b8ee6cf524b9ab39b6b9a0777df5357fb22f15770126023599d7b62eeafc55dc87e0ff401b5df8dab9084a9ea4ba98c850e2ee98d4988bf4ad2 SHA512 3ee0de55cca50c1ea5b8afbc618783c7e301ebdc570c34d590160468b0b7708afe83589669c08106ac006e64436903ccbb3b3322e2801332b921ea802a788d86 |
25 |
-DIST logstash-7.16.2-linux-x86_64.tar.gz 365618045 BLAKE2B ccbdc8c61dd6d2a95971a8a11eb4c92b2388214a34a7b6024fdad03676308b0bab030287f5db3132c47caff53f82259ba2422cd72ef77c358020d1866278bd32 SHA512 1ff7077735167e328766bb710e4a22e139a713ef940946e454cd21ebe61b5e50af042c0da1baac6eafba973e96f596b80a0342e9dc26beecd3740e6e37e6c981 |
26 |
DIST logstash-7.16.3-linux-x86_64.tar.gz 364791274 BLAKE2B 12e9944dce3e270358ef02d292655171911774a2351bf7c0a4f9aaf6206db31c4b1b114fee24c39fa72d9e10f31e5a6ad56f42dd8a25278c28cec6c2ab52a1b7 SHA512 fd9bc03c4dd58853075cd4d179a613cc24fde22a5decc943197002dc5cda9d03ece716e766084fd3d293293f4de88866264f5bd7e96ffd3d541c555b4264782d |
27 |
-DIST logstash-oss-6.8.22.tar.gz 178446837 BLAKE2B c17bb3c2e2e0e8fd131edbc96516c1739aac9230f75b4473fb1f57020792b4def1caed901391b7762766fa0273a0b3f66153070213ba92e96713d0444f17da73 SHA512 12f51a49fa6d5f3b4f997759beaaf836cb5b792626ab96493f039f2a9018441f246af8ea2d4c344190714b66eb1955b629b403c5cc7aafec4f9abbd6f1ac89fa |
28 |
DIST logstash-oss-6.8.23.tar.gz 177876480 BLAKE2B d961c9073c1108b3a0e74ba763e0ce45b35a5767cd732e7ec756697c5f1526e01b23c0919acefa173b5410e9a4908920a24c1ce351dd7c09d998cb025ba05aef SHA512 87488767c6239878c1383c1f28ca17e8f330c10298542627c0c44a0620976737a1acbca55b8db6b6917d8b8bcb988ec4d84b2a840a4ef6362909b7e230a0e0b6 |
29 |
-DIST logstash-oss-7.16.2-linux-x86_64.tar.gz 365422510 BLAKE2B 89a9ea82d6eb028e4dea18f19453671a138d26507c0dd3409f8113d48de4bcf2bb93f11cc7f1d4e85596cc5ba5e3219d2abe1a9ef55c753e0cc13f6cefa3d2f5 SHA512 b87925bd62387bfcf9e06efedb6e18daf15d221a81f60ed16a837e3c2673948b1c835703675ece7101f9da03ae202f55d2e1859a9fd67d420d824ef69bd1bb1a |
30 |
DIST logstash-oss-7.16.3-linux-x86_64.tar.gz 364597354 BLAKE2B 9ddda512913491cc178fccc513d9a26298dda62169db8e8e1c61d6c37ad4af08b1cc152d978f8b353030d9366a07e53acc4596162ab5f7f5e57060d953d99c97 SHA512 b49ed0923ac202e406919758fbeadf1169492ff3d60adad6dba5e2eb3de08344b1e060d6efa2161c1653636bf51f7f8f877992f0d2cd06c5d35d7323f84dadbc |
31 |
|
32 |
diff --git a/app-admin/logstash-bin/logstash-bin-6.8.22.ebuild b/app-admin/logstash-bin/logstash-bin-6.8.22.ebuild |
33 |
deleted file mode 100644 |
34 |
index beabb835c090..000000000000 |
35 |
--- a/app-admin/logstash-bin/logstash-bin-6.8.22.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,73 +0,0 @@ |
38 |
-# Copyright 1999-2021 Gentoo Authors |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=7 |
42 |
- |
43 |
-inherit java-pkg-2 |
44 |
- |
45 |
-MY_PN="${PN%-bin}" |
46 |
-MY_P="${MY_PN}-${PV}" |
47 |
- |
48 |
-DESCRIPTION="Tool for managing events and logs" |
49 |
-HOMEPAGE="https://www.elastic.co/products/logstash" |
50 |
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}.tar.gz ) |
51 |
- !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}.tar.gz )" |
52 |
- |
53 |
-# source: LICENSE.txt and NOTICE.txt |
54 |
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )" |
55 |
-SLOT="0" |
56 |
-KEYWORDS="~amd64" |
57 |
-IUSE="x-pack" |
58 |
- |
59 |
-RESTRICT="strip" |
60 |
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so" |
61 |
- |
62 |
-RDEPEND="acct-group/logstash |
63 |
- acct-user/logstash |
64 |
- virtual/jre:1.8" |
65 |
- |
66 |
-S="${WORKDIR}/${MY_P}" |
67 |
- |
68 |
-src_install() { |
69 |
- keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} |
70 |
- keepdir "/var/log/${MY_PN}" |
71 |
- |
72 |
- insinto "/usr/share/${MY_PN}" |
73 |
- newins "${FILESDIR}/agent.conf.sample" agent.conf |
74 |
- |
75 |
- rm -v config/{pipelines.yml,startup.options} || die |
76 |
- insinto /etc/${MY_PN} |
77 |
- doins -r config/. |
78 |
- doins "${FILESDIR}/pipelines.yml" |
79 |
- rm -rv config data || die |
80 |
- |
81 |
- insinto "/opt/${MY_PN}" |
82 |
- doins -r . |
83 |
- fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin" |
84 |
- |
85 |
- newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}" |
86 |
- newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}" |
87 |
- |
88 |
- insinto /usr/share/eselect/modules |
89 |
- doins "${FILESDIR}"/logstash-plugin.eselect |
90 |
-} |
91 |
- |
92 |
-pkg_postinst() { |
93 |
- ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)" |
94 |
- ewarn "Install the plugins via eselect module that will automatically re-install" |
95 |
- ewarn "all self installed plugins after Logstash upgrades." |
96 |
- elog |
97 |
- elog "Installing plugins:" |
98 |
- elog "eselect logstash-plugin install logstash-output-gelf" |
99 |
- elog |
100 |
- |
101 |
- elog "Reinstalling self installed plugins (installed via eselect module):" |
102 |
- eselect logstash-plugin reinstall |
103 |
- |
104 |
- elog |
105 |
- elog "Sample configuration:" |
106 |
- elog "${EROOT}/usr/share/${MY_PN}" |
107 |
- elog |
108 |
- elog "The default pipeline configuration expects the configuration(s) to be found in:" |
109 |
- elog "${EROOT}/etc/logstash/conf.d/*.conf" |
110 |
-} |
111 |
|
112 |
diff --git a/app-admin/logstash-bin/logstash-bin-7.16.2.ebuild b/app-admin/logstash-bin/logstash-bin-7.16.2.ebuild |
113 |
deleted file mode 100644 |
114 |
index 6040aa3a3db5..000000000000 |
115 |
--- a/app-admin/logstash-bin/logstash-bin-7.16.2.ebuild |
116 |
+++ /dev/null |
117 |
@@ -1,88 +0,0 @@ |
118 |
-# Copyright 1999-2021 Gentoo Authors |
119 |
-# Distributed under the terms of the GNU General Public License v2 |
120 |
- |
121 |
-EAPI=7 |
122 |
- |
123 |
-inherit java-pkg-2 |
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="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz ) |
131 |
- !x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )" |
132 |
- |
133 |
-# source: LICENSE.txt and NOTICE.txt |
134 |
-LICENSE="Apache-2.0 MIT x-pack? ( Elastic )" |
135 |
-SLOT="0" |
136 |
-KEYWORDS="~amd64" |
137 |
-IUSE="x-pack" |
138 |
- |
139 |
-RESTRICT="strip" |
140 |
-QA_PREBUILT="opt/logstash/vendor/jruby/lib/jni/*/libjffi*.so" |
141 |
- |
142 |
-RDEPEND="acct-group/logstash |
143 |
- acct-user/logstash |
144 |
- virtual/jre" |
145 |
- |
146 |
-S="${WORKDIR}/${MY_P}" |
147 |
- |
148 |
-src_prepare() { |
149 |
- default |
150 |
- |
151 |
- local d |
152 |
- for d in aarch64-FreeBSD aarch64-Linux arm-Linux Darwin i386-Linux i386-SunOS \ |
153 |
- i386-Windows mips64el-Linux ppc64-AIX ppc64le-Linux ppc64-Linux \ |
154 |
- ppc-AIX s390x-Linux sparcv9-Linux sparcv9-SunOS x86_64-DragonFlyBSD \ |
155 |
- x86_64-FreeBSD x86_64-OpenBSD x86_64-SunOS x86_64-Windows; do |
156 |
- rm -r vendor/jruby/lib/jni/$d || die |
157 |
- done |
158 |
- |
159 |
- # remove bundled java |
160 |
- rm -r jdk || die |
161 |
-} |
162 |
- |
163 |
-src_install() { |
164 |
- keepdir /etc/"${MY_PN}"/{conf.d,patterns,plugins} |
165 |
- keepdir "/var/log/${MY_PN}" |
166 |
- |
167 |
- insinto "/usr/share/${MY_PN}" |
168 |
- newins "${FILESDIR}/agent.conf.sample" agent.conf |
169 |
- |
170 |
- rm -v config/{pipelines.yml,startup.options} || die |
171 |
- insinto /etc/${MY_PN} |
172 |
- doins -r config/. |
173 |
- doins "${FILESDIR}/pipelines.yml" |
174 |
- rm -rv config data || die |
175 |
- |
176 |
- insinto "/opt/${MY_PN}" |
177 |
- doins -r . |
178 |
- fperms 0755 "/opt/${MY_PN}/bin/${MY_PN}" "/opt/${MY_PN}/vendor/jruby/bin/jruby" "/opt/${MY_PN}/bin/logstash-plugin" |
179 |
- |
180 |
- newconfd "${FILESDIR}/${MY_PN}.confd-r2" "${MY_PN}" |
181 |
- newinitd "${FILESDIR}/${MY_PN}.initd-r2" "${MY_PN}" |
182 |
- |
183 |
- insinto /usr/share/eselect/modules |
184 |
- doins "${FILESDIR}"/logstash-plugin.eselect |
185 |
-} |
186 |
- |
187 |
-pkg_postinst() { |
188 |
- ewarn "Self installed plugins are removed during Logstash upgrades (Bug #622602)" |
189 |
- ewarn "Install the plugins via eselect module that will automatically re-install" |
190 |
- ewarn "all self installed plugins after Logstash upgrades." |
191 |
- elog |
192 |
- elog "Installing plugins:" |
193 |
- elog "eselect logstash-plugin install logstash-output-gelf" |
194 |
- elog |
195 |
- |
196 |
- elog "Reinstalling self installed plugins (installed via eselect module):" |
197 |
- eselect logstash-plugin reinstall |
198 |
- |
199 |
- elog |
200 |
- elog "Sample configuration:" |
201 |
- elog "${EROOT}/usr/share/${MY_PN}" |
202 |
- elog |
203 |
- elog "The default pipeline configuration expects the configuration(s) to be found in:" |
204 |
- elog "${EROOT}/etc/logstash/conf.d/*.conf" |
205 |
-} |