Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/buildbot-worker/
Date: Sat, 31 Dec 2022 15:08:57
Message-Id: 1672499318.2cb2f6b700be6e1ff32855670aa6743bef7fdbdf.sam@gentoo
1 commit: 2cb2f6b700be6e1ff32855670aa6743bef7fdbdf
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 31 15:06:02 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 31 15:08:38 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cb2f6b7
7
8 dev-util/buildbot-worker: drop 3.4.0, 3.5.0-r1, 3.6.0
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-util/buildbot-worker/Manifest | 3 -
13 .../buildbot-worker/buildbot-worker-3.4.0.ebuild | 125 --------------------
14 .../buildbot-worker-3.5.0-r1.ebuild | 129 ---------------------
15 .../buildbot-worker/buildbot-worker-3.6.0.ebuild | 129 ---------------------
16 4 files changed, 386 deletions(-)
17
18 diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
19 index 79bd8d18300c..aec8d3312aff 100644
20 --- a/dev-util/buildbot-worker/Manifest
21 +++ b/dev-util/buildbot-worker/Manifest
22 @@ -1,4 +1 @@
23 -DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
24 -DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
25 -DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136
26 DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
27
28 diff --git a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
29 deleted file mode 100644
30 index e80a110a2894..000000000000
31 --- a/dev-util/buildbot-worker/buildbot-worker-3.4.0.ebuild
32 +++ /dev/null
33 @@ -1,125 +0,0 @@
34 -# Copyright 1999-2022 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=8
38 -
39 -DISTUTILS_USE_PEP517=setuptools
40 -PYTHON_COMPAT=( python3_{8..10} )
41 -inherit readme.gentoo-r1 distutils-r1
42 -
43 -MY_V="${PV/_p/.post}"
44 -MY_P="${PN}-${MY_V}"
45 -
46 -DESCRIPTION="BuildBot Worker (slave) Daemon"
47 -HOMEPAGE="https://buildbot.net/
48 - https://github.com/buildbot/buildbot
49 - https://pypi.org/project/buildbot-worker/"
50 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
51 -S="${WORKDIR}/${MY_P}"
52 -
53 -LICENSE="GPL-2"
54 -SLOT="0"
55 -KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
56 -IUSE="test"
57 -RESTRICT="!test? ( test )"
58 -
59 -RDEPEND="
60 - acct-user/buildbot
61 - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
62 - dev-python/future[${PYTHON_USEDEP}]
63 - !<dev-util/buildbot-1.0.0
64 -"
65 -BDEPEND="
66 - test? (
67 - ${RDEPEND}
68 - dev-python/mock[${PYTHON_USEDEP}]
69 - )
70 -"
71 -
72 -DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
73 -to support starting buildbot_worker through Gentoo's init system. To use this,
74 -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
75 -Set up your build worker following the documentation, make sure the
76 -resulting directories are owned by the \"buildbot\" user and point
77 -\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
78 -The scripts can run as a different user if desired."
79 -
80 -python_test() {
81 - "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
82 -}
83 -
84 -python_install_all() {
85 - distutils-r1_python_install_all
86 -
87 - doman docs/buildbot-worker.1
88 -
89 - newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
90 - newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
91 -
92 - dodir /var/lib/buildbot_worker
93 - cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
94 -
95 - readme.gentoo_create_doc
96 -}
97 -
98 -pkg_postinst() {
99 - readme.gentoo_print_elog
100 -
101 - if [[ -n ${REPLACING_VERSIONS} ]]; then
102 - ewarn
103 - ewarn "More than one instance of a buildbot_worker can be run simultaneously."
104 - ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
105 - ewarn "is now the common base directory for all instances. If you are migrating from an older"
106 - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
107 - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
108 - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
109 - ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
110 - ewarn " rc-update add buildbot_worker.myinstance default"
111 - ewarn " /etc/init.d/buildbot_worker.myinstance start"
112 - ewarn "Systems using systemd can do the following:"
113 - ewarn " systemctl enable buildbot_worker@××××××××××.service"
114 - ewarn " systemctl enable buildbot_worker.target"
115 - ewarn " systemctl start buildbot_worker.target"
116 - fi
117 -}
118 -
119 -pkg_config() {
120 - local buildworker_path="/var/lib/buildbot_worker"
121 - local log_path="/var/log/buildbot_worker"
122 -
123 - einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
124 - einfo "Press Control-C to abort."
125 -
126 - einfo "Enter the name for the new instance: "
127 - read instance_name
128 - [[ -z "${instance_name}" ]] && die "Invalid instance name"
129 -
130 - local instance_path="${buildworker_path}/${instance_name}"
131 - local instance_log_path="${log_path}/${instance_name}"
132 -
133 - if [[ -e "${instance_path}" ]]; then
134 - eerror "The instance with the specified name already exists:"
135 - eerror "${instance_path}"
136 - die "Instance already exists"
137 - fi
138 -
139 - if [[ ! -d "${instance_path}" ]]; then
140 - mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
141 - fi
142 - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
143 - cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
144 - || die "Moving sample configuration failed"
145 - ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
146 - || die "Unable to create link to init file"
147 -
148 - if [[ ! -d "${instance_log_path}" ]]; then
149 - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
150 - chown --recursive buildbot:buildbot "${instance_log_path}" \
151 - || die "Setting permissions for instance failed"
152 - fi
153 - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
154 - || die "Unable to create link to log file"
155 -
156 - einfo "Successfully created a buildbot_worker instance at ${instance_path}."
157 - einfo "To change the default settings edit the buildbot.tac file in this directory."
158 -}
159
160 diff --git a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
161 deleted file mode 100644
162 index 2a3f7714573d..000000000000
163 --- a/dev-util/buildbot-worker/buildbot-worker-3.5.0-r1.ebuild
164 +++ /dev/null
165 @@ -1,129 +0,0 @@
166 -# Copyright 1999-2022 Gentoo Authors
167 -# Distributed under the terms of the GNU General Public License v2
168 -
169 -EAPI=8
170 -
171 -DISTUTILS_USE_PEP517=setuptools
172 -PYTHON_COMPAT=( python3_{8..10} )
173 -inherit readme.gentoo-r1 distutils-r1
174 -
175 -MY_V="${PV/_p/.post}"
176 -MY_P="${PN}-${MY_V}"
177 -
178 -DESCRIPTION="BuildBot Worker (slave) Daemon"
179 -HOMEPAGE="https://buildbot.net/
180 - https://github.com/buildbot/buildbot
181 - https://pypi.org/project/buildbot-worker/"
182 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
183 -S="${WORKDIR}/${MY_P}"
184 -
185 -LICENSE="GPL-2"
186 -SLOT="0"
187 -KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
188 -IUSE="test"
189 -RESTRICT="!test? ( test )"
190 -
191 -RDEPEND="
192 - acct-user/buildbot
193 - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
194 - >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
195 - >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
196 - dev-python/future[${PYTHON_USEDEP}]
197 - !<dev-util/buildbot-1.0.0
198 -"
199 -BDEPEND="
200 - test? (
201 - ${RDEPEND}
202 - dev-python/mock[${PYTHON_USEDEP}]
203 - dev-python/parameterized[${PYTHON_USEDEP}]
204 - dev-python/psutil[${PYTHON_USEDEP}]
205 - )
206 -"
207 -
208 -DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
209 -to support starting buildbot_worker through Gentoo's init system. To use this,
210 -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
211 -Set up your build worker following the documentation, make sure the
212 -resulting directories are owned by the \"buildbot\" user and point
213 -\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
214 -The scripts can run as a different user if desired."
215 -
216 -python_test() {
217 - "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
218 -}
219 -
220 -python_install_all() {
221 - distutils-r1_python_install_all
222 -
223 - doman docs/buildbot-worker.1
224 -
225 - newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
226 - newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
227 -
228 - dodir /var/lib/buildbot_worker
229 - cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
230 -
231 - readme.gentoo_create_doc
232 -}
233 -
234 -pkg_postinst() {
235 - readme.gentoo_print_elog
236 -
237 - if [[ -n ${REPLACING_VERSIONS} ]]; then
238 - ewarn
239 - ewarn "More than one instance of a buildbot_worker can be run simultaneously."
240 - ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
241 - ewarn "is now the common base directory for all instances. If you are migrating from an older"
242 - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
243 - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
244 - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
245 - ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
246 - ewarn " rc-update add buildbot_worker.myinstance default"
247 - ewarn " /etc/init.d/buildbot_worker.myinstance start"
248 - ewarn "Systems using systemd can do the following:"
249 - ewarn " systemctl enable buildbot_worker@××××××××××.service"
250 - ewarn " systemctl enable buildbot_worker.target"
251 - ewarn " systemctl start buildbot_worker.target"
252 - fi
253 -}
254 -
255 -pkg_config() {
256 - local buildworker_path="/var/lib/buildbot_worker"
257 - local log_path="/var/log/buildbot_worker"
258 -
259 - einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
260 - einfo "Press Control-C to abort."
261 -
262 - einfo "Enter the name for the new instance: "
263 - read instance_name
264 - [[ -z "${instance_name}" ]] && die "Invalid instance name"
265 -
266 - local instance_path="${buildworker_path}/${instance_name}"
267 - local instance_log_path="${log_path}/${instance_name}"
268 -
269 - if [[ -e "${instance_path}" ]]; then
270 - eerror "The instance with the specified name already exists:"
271 - eerror "${instance_path}"
272 - die "Instance already exists"
273 - fi
274 -
275 - if [[ ! -d "${instance_path}" ]]; then
276 - mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
277 - fi
278 - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
279 - cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
280 - || die "Moving sample configuration failed"
281 - ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
282 - || die "Unable to create link to init file"
283 -
284 - if [[ ! -d "${instance_log_path}" ]]; then
285 - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
286 - chown --recursive buildbot:buildbot "${instance_log_path}" \
287 - || die "Setting permissions for instance failed"
288 - fi
289 - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
290 - || die "Unable to create link to log file"
291 -
292 - einfo "Successfully created a buildbot_worker instance at ${instance_path}."
293 - einfo "To change the default settings edit the buildbot.tac file in this directory."
294 -}
295
296 diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
297 deleted file mode 100644
298 index 34360f39c453..000000000000
299 --- a/dev-util/buildbot-worker/buildbot-worker-3.6.0.ebuild
300 +++ /dev/null
301 @@ -1,129 +0,0 @@
302 -# Copyright 1999-2022 Gentoo Authors
303 -# Distributed under the terms of the GNU General Public License v2
304 -
305 -EAPI=8
306 -
307 -DISTUTILS_USE_PEP517=setuptools
308 -PYTHON_COMPAT=( python3_{8..10} )
309 -inherit readme.gentoo-r1 distutils-r1
310 -
311 -MY_V="${PV/_p/.post}"
312 -MY_P="${PN}-${MY_V}"
313 -
314 -DESCRIPTION="BuildBot Worker (slave) Daemon"
315 -HOMEPAGE="https://buildbot.net/
316 - https://github.com/buildbot/buildbot
317 - https://pypi.org/project/buildbot-worker/"
318 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
319 -S="${WORKDIR}/${MY_P}"
320 -
321 -LICENSE="GPL-2"
322 -SLOT="0"
323 -KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
324 -IUSE="test"
325 -RESTRICT="!test? ( test )"
326 -
327 -RDEPEND="
328 - acct-user/buildbot
329 - >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
330 - >=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
331 - >=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
332 - dev-python/future[${PYTHON_USEDEP}]
333 - !<dev-util/buildbot-1.0.0
334 -"
335 -BDEPEND="
336 - test? (
337 - ${RDEPEND}
338 - dev-python/mock[${PYTHON_USEDEP}]
339 - dev-python/parameterized[${PYTHON_USEDEP}]
340 - dev-python/psutil[${PYTHON_USEDEP}]
341 - )
342 -"
343 -
344 -DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
345 -to support starting buildbot_worker through Gentoo's init system. To use this,
346 -execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
347 -Set up your build worker following the documentation, make sure the
348 -resulting directories are owned by the \"buildbot\" user and point
349 -\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
350 -The scripts can run as a different user if desired."
351 -
352 -python_test() {
353 - "${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
354 -}
355 -
356 -python_install_all() {
357 - distutils-r1_python_install_all
358 -
359 - doman docs/buildbot-worker.1
360 -
361 - newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
362 - newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
363 -
364 - dodir /var/lib/buildbot_worker
365 - cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
366 -
367 - readme.gentoo_create_doc
368 -}
369 -
370 -pkg_postinst() {
371 - readme.gentoo_print_elog
372 -
373 - if [[ -n ${REPLACING_VERSIONS} ]]; then
374 - ewarn
375 - ewarn "More than one instance of a buildbot_worker can be run simultaneously."
376 - ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
377 - ewarn "is now the common base directory for all instances. If you are migrating from an older"
378 - ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
379 - ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
380 - ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
381 - ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
382 - ewarn " rc-update add buildbot_worker.myinstance default"
383 - ewarn " /etc/init.d/buildbot_worker.myinstance start"
384 - ewarn "Systems using systemd can do the following:"
385 - ewarn " systemctl enable buildbot_worker@××××××××××.service"
386 - ewarn " systemctl enable buildbot_worker.target"
387 - ewarn " systemctl start buildbot_worker.target"
388 - fi
389 -}
390 -
391 -pkg_config() {
392 - local buildworker_path="/var/lib/buildbot_worker"
393 - local log_path="/var/log/buildbot_worker"
394 -
395 - einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
396 - einfo "Press Control-C to abort."
397 -
398 - einfo "Enter the name for the new instance: "
399 - read instance_name
400 - [[ -z "${instance_name}" ]] && die "Invalid instance name"
401 -
402 - local instance_path="${buildworker_path}/${instance_name}"
403 - local instance_log_path="${log_path}/${instance_name}"
404 -
405 - if [[ -e "${instance_path}" ]]; then
406 - eerror "The instance with the specified name already exists:"
407 - eerror "${instance_path}"
408 - die "Instance already exists"
409 - fi
410 -
411 - if [[ ! -d "${instance_path}" ]]; then
412 - mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
413 - fi
414 - chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
415 - cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
416 - || die "Moving sample configuration failed"
417 - ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
418 - || die "Unable to create link to init file"
419 -
420 - if [[ ! -d "${instance_log_path}" ]]; then
421 - mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
422 - chown --recursive buildbot:buildbot "${instance_log_path}" \
423 - || die "Setting permissions for instance failed"
424 - fi
425 - ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
426 - || die "Unable to create link to log file"
427 -
428 - einfo "Successfully created a buildbot_worker instance at ${instance_path}."
429 - einfo "To change the default settings edit the buildbot.tac file in this directory."
430 -}