Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/
Date: Tue, 29 Jun 2021 16:22:36
Message-Id: 1624983629.057c34468b21195fea18bc4b1fe59f0d4a422520.floppym@gentoo
1 commit: 057c34468b21195fea18bc4b1fe59f0d4a422520
2 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com>
3 AuthorDate: Mon Jun 28 18:22:06 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 16:20:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=057c3446
7
8 net-analyzer/zabbix: migrate to tmpfiles.eclass
9
10 The systemd_newtmpfilesd function is deprecated.
11
12 Package-Manager: Portage-3.0.20, Repoman-3.0.2
13 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
14 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
15
16 net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild | 10 +++++-----
17 net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild | 10 +++++-----
18 net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild | 10 +++++-----
19 net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild | 10 +++++-----
20 net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild | 10 +++++-----
21 net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild | 10 +++++-----
22 6 files changed, 30 insertions(+), 30 deletions(-)
23
24 diff --git a/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild
25 index 87d5506841f..33057925ecd 100644
26 --- a/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild
27 +++ b/net-analyzer/zabbix/zabbix-5.0.10-r1.ebuild
28 @@ -5,7 +5,7 @@ EAPI=7
29
30 # needed to make webapp-config dep optional
31 WEBAPP_OPTIONAL="yes"
32 -inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
33 +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
34 EGO_SUM=(
35 "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
36 "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
37 @@ -421,7 +421,7 @@ src_install() {
38 doins -r "${S}"/database/
39
40 systemd_dounit "${FILESDIR}"/zabbix-server.service
41 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
42 + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
43 fi
44
45 if use proxy; then
46 @@ -438,7 +438,7 @@ src_install() {
47 doins -r "${S}"/database/
48
49 systemd_dounit "${FILESDIR}"/zabbix-proxy.service
50 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
51 + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
52 fi
53
54 if use agent; then
55 @@ -455,7 +455,7 @@ src_install() {
56 src/zabbix_get/zabbix_get
57
58 systemd_dounit "${FILESDIR}"/zabbix-agentd.service
59 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
60 + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
61 fi
62
63 if use agent2; then
64 @@ -469,7 +469,7 @@ src_install() {
65 dosbin src/go/bin/zabbix_agent2
66
67 systemd_dounit "${FILESDIR}"/zabbix-agent2.service
68 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
69 + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
70 fi
71
72 fowners root:zabbix /etc/zabbix
73
74 diff --git a/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild
75 index 87d5506841f..33057925ecd 100644
76 --- a/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild
77 +++ b/net-analyzer/zabbix/zabbix-5.0.11-r1.ebuild
78 @@ -5,7 +5,7 @@ EAPI=7
79
80 # needed to make webapp-config dep optional
81 WEBAPP_OPTIONAL="yes"
82 -inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
83 +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
84 EGO_SUM=(
85 "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
86 "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69/go.mod h1:L1AbZdiDllfyYH5l5OkAaZtk7VkWe89bPJFmnDBNHxg="
87 @@ -421,7 +421,7 @@ src_install() {
88 doins -r "${S}"/database/
89
90 systemd_dounit "${FILESDIR}"/zabbix-server.service
91 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
92 + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
93 fi
94
95 if use proxy; then
96 @@ -438,7 +438,7 @@ src_install() {
97 doins -r "${S}"/database/
98
99 systemd_dounit "${FILESDIR}"/zabbix-proxy.service
100 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
101 + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
102 fi
103
104 if use agent; then
105 @@ -455,7 +455,7 @@ src_install() {
106 src/zabbix_get/zabbix_get
107
108 systemd_dounit "${FILESDIR}"/zabbix-agentd.service
109 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
110 + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
111 fi
112
113 if use agent2; then
114 @@ -469,7 +469,7 @@ src_install() {
115 dosbin src/go/bin/zabbix_agent2
116
117 systemd_dounit "${FILESDIR}"/zabbix-agent2.service
118 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
119 + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
120 fi
121
122 fowners root:zabbix /etc/zabbix
123
124 diff --git a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
125 index 40d10b23dee..7a329ff5b8b 100644
126 --- a/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
127 +++ b/net-analyzer/zabbix/zabbix-5.0.12-r1.ebuild
128 @@ -5,7 +5,7 @@ EAPI=7
129
130 # needed to make webapp-config dep optional
131 WEBAPP_OPTIONAL="yes"
132 -inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
133 +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
134 EGO_SUM=(
135 "github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU="
136 "github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I="
137 @@ -419,7 +419,7 @@ src_install() {
138 doins -r "${S}"/database/
139
140 systemd_dounit "${FILESDIR}"/zabbix-server.service
141 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
142 + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
143 fi
144
145 if use proxy; then
146 @@ -436,7 +436,7 @@ src_install() {
147 doins -r "${S}"/database/
148
149 systemd_dounit "${FILESDIR}"/zabbix-proxy.service
150 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
151 + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
152 fi
153
154 if use agent; then
155 @@ -453,7 +453,7 @@ src_install() {
156 src/zabbix_get/zabbix_get
157
158 systemd_dounit "${FILESDIR}"/zabbix-agentd.service
159 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
160 + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
161 fi
162
163 if use agent2; then
164 @@ -467,7 +467,7 @@ src_install() {
165 dosbin src/go/bin/zabbix_agent2
166
167 systemd_dounit "${FILESDIR}"/zabbix-agent2.service
168 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
169 + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
170 fi
171
172 fowners root:zabbix /etc/zabbix
173
174 diff --git a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
175 index 7b7445ca6d8..0abc5c33063 100644
176 --- a/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
177 +++ b/net-analyzer/zabbix/zabbix-5.2.6-r1.ebuild
178 @@ -5,7 +5,7 @@ EAPI=7
179
180 # needed to make webapp-config dep optional
181 WEBAPP_OPTIONAL="yes"
182 -inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
183 +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
184 # content of src/go/go.sum
185 EGO_SUM=(
186 "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
187 @@ -428,7 +428,7 @@ src_install() {
188 doins -r "${S}"/database/
189
190 systemd_dounit "${FILESDIR}"/zabbix-server.service
191 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
192 + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
193 fi
194
195 if use proxy; then
196 @@ -445,7 +445,7 @@ src_install() {
197 doins -r "${S}"/database/
198
199 systemd_dounit "${FILESDIR}"/zabbix-proxy.service
200 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
201 + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
202 fi
203
204 if use agent; then
205 @@ -462,7 +462,7 @@ src_install() {
206 src/zabbix_get/zabbix_get
207
208 systemd_dounit "${FILESDIR}"/zabbix-agentd.service
209 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
210 + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
211 fi
212 if use agent2; then
213 insinto /etc/zabbix
214 @@ -475,7 +475,7 @@ src_install() {
215 dosbin src/go/bin/zabbix_agent2
216
217 systemd_dounit "${FILESDIR}"/zabbix-agent2.service
218 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
219 + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
220 fi
221
222 fowners root:zabbix /etc/zabbix
223
224 diff --git a/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild
225 index 71c7af9479b..359d8dd9cdd 100644
226 --- a/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild
227 +++ b/net-analyzer/zabbix/zabbix-5.4.0-r1.ebuild
228 @@ -5,7 +5,7 @@ EAPI=7
229
230 # needed to make webapp-config dep optional
231 WEBAPP_OPTIONAL="yes"
232 -inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
233 +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
234 # content of src/go/go.sum
235 EGO_SUM=(
236 "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
237 @@ -444,7 +444,7 @@ src_install() {
238 doins -r "${S}"/database/
239
240 systemd_dounit "${FILESDIR}"/zabbix-server.service
241 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
242 + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
243 fi
244
245 if use proxy; then
246 @@ -461,7 +461,7 @@ src_install() {
247 doins -r "${S}"/database/
248
249 systemd_dounit "${FILESDIR}"/zabbix-proxy.service
250 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
251 + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
252 fi
253
254 if use agent; then
255 @@ -478,7 +478,7 @@ src_install() {
256 src/zabbix_get/zabbix_get
257
258 systemd_dounit "${FILESDIR}"/zabbix-agentd.service
259 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
260 + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
261 fi
262 if use agent2; then
263 insinto /etc/zabbix
264 @@ -491,7 +491,7 @@ src_install() {
265 dosbin src/go/bin/zabbix_agent2
266
267 systemd_dounit "${FILESDIR}"/zabbix-agent2.service
268 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
269 + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
270 fi
271
272 fowners root:zabbix /etc/zabbix
273
274 diff --git a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
275 index 71c7af9479b..359d8dd9cdd 100644
276 --- a/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
277 +++ b/net-analyzer/zabbix/zabbix-5.4.1-r1.ebuild
278 @@ -5,7 +5,7 @@ EAPI=7
279
280 # needed to make webapp-config dep optional
281 WEBAPP_OPTIONAL="yes"
282 -inherit webapp java-pkg-opt-2 systemd toolchain-funcs go-module user-info
283 +inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
284 # content of src/go/go.sum
285 EGO_SUM=(
286 "github.com/BurntSushi/locker v0.0.0-20171006230638-a6e239ea1c69 h1:+tu3HOoMXB7RXEINRVIpxJCT+KdYiI7LAEAUrOw3dIU="
287 @@ -444,7 +444,7 @@ src_install() {
288 doins -r "${S}"/database/
289
290 systemd_dounit "${FILESDIR}"/zabbix-server.service
291 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
292 + newtmpfiles "${FILESDIR}"/zabbix-server.tmpfiles zabbix-server.conf
293 fi
294
295 if use proxy; then
296 @@ -461,7 +461,7 @@ src_install() {
297 doins -r "${S}"/database/
298
299 systemd_dounit "${FILESDIR}"/zabbix-proxy.service
300 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
301 + newtmpfiles "${FILESDIR}"/zabbix-proxy.tmpfiles zabbix-proxy.conf
302 fi
303
304 if use agent; then
305 @@ -478,7 +478,7 @@ src_install() {
306 src/zabbix_get/zabbix_get
307
308 systemd_dounit "${FILESDIR}"/zabbix-agentd.service
309 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
310 + newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
311 fi
312 if use agent2; then
313 insinto /etc/zabbix
314 @@ -491,7 +491,7 @@ src_install() {
315 dosbin src/go/bin/zabbix_agent2
316
317 systemd_dounit "${FILESDIR}"/zabbix-agent2.service
318 - systemd_newtmpfilesd "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
319 + newtmpfiles "${FILESDIR}"/zabbix-agent2.tmpfiles zabbix-agent2.conf
320 fi
321
322 fowners root:zabbix /etc/zabbix
Report Message
Find on MARC Find on Google Groups