1 |
commit: cc96fdd306798463205df2d30bd5c9931f6f6591 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 1 18:53:25 2020 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 1 22:57:32 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc96fdd3 |
7 |
|
8 |
dev-util/buildbot-worker: Version bump, clena vulnerable |
9 |
|
10 |
Clean old vulnerable release versions. |
11 |
Optimize 9999 and release ebuilds. |
12 |
|
13 |
gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=711702 |
14 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
15 |
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org> |
16 |
|
17 |
dev-util/buildbot-worker/Manifest | 4 +- |
18 |
.../buildbot-worker/buildbot-worker-0.9.12.ebuild | 134 --------------------- |
19 |
.../buildbot-worker/buildbot-worker-1.3.0.ebuild | 134 --------------------- |
20 |
...r-1.1.2.ebuild => buildbot-worker-2.8.0.ebuild} | 42 +++---- |
21 |
.../buildbot-worker/buildbot-worker-9999.ebuild | 13 +- |
22 |
5 files changed, 22 insertions(+), 305 deletions(-) |
23 |
|
24 |
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest |
25 |
index 72f72b3635a..6c7a6260837 100644 |
26 |
--- a/dev-util/buildbot-worker/Manifest |
27 |
+++ b/dev-util/buildbot-worker/Manifest |
28 |
@@ -1,4 +1,2 @@ |
29 |
-DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57 |
30 |
-DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7 |
31 |
-DIST buildbot-worker-1.3.0.tar.gz 103765 BLAKE2B a5f06ad6b87442292f9fe0c7935f791d2fdb450db09c9614324f8230d0bec408380a7b1637dc32806259c4de7699b164f20f76d959232a82253f7134749531d7 SHA512 5e59aab6cecf8dd932df0e8063c69fda5613b76a46df63479ff554085275d4a19fb1b5142034bd4245423e99f3e46d45e765b10c3c74a9f28b92b70119fab9e2 |
32 |
DIST buildbot-worker-2.7.0.tar.gz 101075 BLAKE2B 2ee82434f565bef111685712b9b4dd7b0c522de59eefe3eda672827e4bcffae8288c5b9842221b52aa7d5907eeadd4bc5c635382b8c6c4e82977b3c139afdd4b SHA512 bdfce0a7b222fdddbf7830f90c1775e2bded7080e5053b114b7c136b3e114f6c8b26ee4ad802fce66514524e29e863a2f1a4366758c59ebbc6eeadb4b0a271db |
33 |
+DIST buildbot-worker-2.8.0.tar.gz 102605 BLAKE2B 4cd6d8755803d7649acaf1b45e6632a7a9bddd8a58590a8caa73f686584fedf62d98911a9e148e5a6f34c99b8551cd80c2acbd03fc4f892300cad89a4f68e0b8 SHA512 62f3a72ed7d7ca724b667528e55673c20382ed95abc898dc43e43c5e09bc1d8116eeb2791145097a9b9f7ab2d38a90d974dfbbf5697d8c045a630632ece8512e |
34 |
|
35 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild |
36 |
deleted file mode 100644 |
37 |
index 2fc5d7a0f23..00000000000 |
38 |
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.12.ebuild |
39 |
+++ /dev/null |
40 |
@@ -1,134 +0,0 @@ |
41 |
-# Copyright 1999-2020 Gentoo Authors |
42 |
-# Distributed under the terms of the GNU General Public License v2 |
43 |
- |
44 |
-EAPI="6" |
45 |
-PYTHON_COMPAT=( python3_6 ) |
46 |
- |
47 |
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
48 |
- |
49 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
50 |
-inherit readme.gentoo-r1 user distutils-r1 |
51 |
- |
52 |
-DESCRIPTION="BuildBot Worker (slave) Daemon" |
53 |
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/" |
54 |
- |
55 |
-MY_V="${PV/_p/p}" |
56 |
-MY_P="${PN}-${MY_V}" |
57 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
58 |
- |
59 |
-LICENSE="GPL-2" |
60 |
-SLOT="0" |
61 |
-if [[ ${PV} == *9999 ]]; then |
62 |
- KEYWORDS="" |
63 |
-else |
64 |
- KEYWORDS="~amd64" |
65 |
-fi |
66 |
-IUSE="test" |
67 |
-RESTRICT="!test? ( test )" |
68 |
- |
69 |
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
70 |
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] |
71 |
- dev-python/future[${PYTHON_USEDEP}] |
72 |
- !<dev-util/buildbot-0.9.7 |
73 |
-" |
74 |
-DEPEND="${RDEPEND} |
75 |
- test? ( |
76 |
- dev-python/mock[${PYTHON_USEDEP}] |
77 |
- dev-python/setuptools_trial[${PYTHON_USEDEP}] |
78 |
- ) |
79 |
-" |
80 |
- |
81 |
-S="${WORKDIR}/${MY_P}" |
82 |
-[[ ${PV} == *9999 ]] && S=${S}/slave |
83 |
- |
84 |
-pkg_setup() { |
85 |
- enewuser buildbot |
86 |
- |
87 |
- DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added |
88 |
- to support starting buildbot_worker through Gentoo's init system. To use this, |
89 |
- execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
90 |
- Set up your build worker following the documentation, make sure the |
91 |
- resulting directories are owned by the \"buildbot\" user and point |
92 |
- \"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location. |
93 |
- The scripts can run as a different user if desired." |
94 |
-} |
95 |
- |
96 |
-python_test() { |
97 |
- distutils_install_for_testing |
98 |
- |
99 |
- esetup.py test || die "Tests failed under ${EPYTHON}" |
100 |
-} |
101 |
- |
102 |
-python_install_all() { |
103 |
- distutils-r1_python_install_all |
104 |
- |
105 |
- doman docs/buildbot-worker.1 |
106 |
- |
107 |
- newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker |
108 |
- newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker |
109 |
- |
110 |
- dodir /var/lib/buildbot_worker |
111 |
- cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!" |
112 |
- |
113 |
- readme.gentoo_create_doc |
114 |
-} |
115 |
- |
116 |
-pkg_postinst() { |
117 |
- readme.gentoo_print_elog |
118 |
- |
119 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
120 |
- ewarn |
121 |
- ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker" |
122 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file" |
123 |
- ewarn "is now the common base directory for all instances. If you are migrating from an older" |
124 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
125 |
- ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
126 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
127 |
- ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance" |
128 |
- ewarn " rc-update add buildbot_worker.myinstance default" |
129 |
- ewarn " /etc/init.d/buildbot_worker.myinstance start" |
130 |
- ewarn "Systems using systemd can do the following:" |
131 |
- ewarn " systemctl enable buildbot_worker@××××××××××.service" |
132 |
- ewarn " systemctl enable buildbot_worker.target" |
133 |
- ewarn " systemctl start buildbot_worker.target" |
134 |
- fi |
135 |
-} |
136 |
- |
137 |
-pkg_config() { |
138 |
- local buildworker_path="/var/lib/buildbot_worker" |
139 |
- local log_path="/var/log/buildbot_worker" |
140 |
- |
141 |
- einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}." |
142 |
- einfo "Press Control-C to abort." |
143 |
- |
144 |
- einfo "Enter the name for the new instance: " |
145 |
- read instance_name |
146 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
147 |
- |
148 |
- local instance_path="${buildworker_path}/${instance_name}" |
149 |
- local instance_log_path="${log_path}/${instance_name}" |
150 |
- |
151 |
- if [[ -e "${instance_path}" ]]; then |
152 |
- eerror "The instance with the specified name already exists:" |
153 |
- eerror "${instance_path}" |
154 |
- die "Instance already exists" |
155 |
- fi |
156 |
- |
157 |
- if [[ ! -d "${instance_path}" ]]; then |
158 |
- mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" |
159 |
- fi |
160 |
- chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" |
161 |
- cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ |
162 |
- || die "Moving sample configuration failed" |
163 |
- ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ |
164 |
- || die "Unable to create link to init file" |
165 |
- |
166 |
- if [[ ! -d "${instance_log_path}" ]]; then |
167 |
- mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
168 |
- fi |
169 |
- ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ |
170 |
- || die "Unable to create link to log file" |
171 |
- |
172 |
- einfo "Successfully created a buildbot_worker instance at ${instance_path}." |
173 |
- einfo "To change the default settings edit the buildbot.tac file in this directory." |
174 |
-} |
175 |
|
176 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild |
177 |
deleted file mode 100644 |
178 |
index a8ac9da44f5..00000000000 |
179 |
--- a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild |
180 |
+++ /dev/null |
181 |
@@ -1,134 +0,0 @@ |
182 |
-# Copyright 1999-2020 Gentoo Authors |
183 |
-# Distributed under the terms of the GNU General Public License v2 |
184 |
- |
185 |
-EAPI="6" |
186 |
-PYTHON_COMPAT=( python3_6 ) |
187 |
- |
188 |
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
189 |
- |
190 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
191 |
-inherit readme.gentoo-r1 user distutils-r1 |
192 |
- |
193 |
-DESCRIPTION="BuildBot Worker (slave) Daemon" |
194 |
-HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/" |
195 |
- |
196 |
-MY_V="${PV/_p/.post}" |
197 |
-MY_P="${PN}-${MY_V}" |
198 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
199 |
- |
200 |
-LICENSE="GPL-2" |
201 |
-SLOT="0" |
202 |
-if [[ ${PV} == *9999 ]]; then |
203 |
- KEYWORDS="" |
204 |
-else |
205 |
- KEYWORDS="~amd64" |
206 |
-fi |
207 |
-IUSE="test" |
208 |
-RESTRICT="!test? ( test )" |
209 |
- |
210 |
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
211 |
- >=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] |
212 |
- dev-python/future[${PYTHON_USEDEP}] |
213 |
- !<dev-util/buildbot-0.9.7 |
214 |
-" |
215 |
-DEPEND="${RDEPEND} |
216 |
- test? ( |
217 |
- dev-python/mock[${PYTHON_USEDEP}] |
218 |
- dev-python/setuptools_trial[${PYTHON_USEDEP}] |
219 |
- ) |
220 |
-" |
221 |
- |
222 |
-S="${WORKDIR}/${MY_P}" |
223 |
-[[ ${PV} == *9999 ]] && S=${S}/worker |
224 |
- |
225 |
-pkg_setup() { |
226 |
- enewuser buildbot |
227 |
- |
228 |
- DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added |
229 |
- to support starting buildbot_worker through Gentoo's init system. To use this, |
230 |
- execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
231 |
- Set up your build worker following the documentation, make sure the |
232 |
- resulting directories are owned by the \"buildbot\" user and point |
233 |
- \"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location. |
234 |
- The scripts can run as a different user if desired." |
235 |
-} |
236 |
- |
237 |
-python_test() { |
238 |
- distutils_install_for_testing |
239 |
- |
240 |
- esetup.py test || die "Tests failed under ${EPYTHON}" |
241 |
-} |
242 |
- |
243 |
-python_install_all() { |
244 |
- distutils-r1_python_install_all |
245 |
- |
246 |
- doman docs/buildbot-worker.1 |
247 |
- |
248 |
- newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker |
249 |
- newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker |
250 |
- |
251 |
- dodir /var/lib/buildbot_worker |
252 |
- cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!" |
253 |
- |
254 |
- readme.gentoo_create_doc |
255 |
-} |
256 |
- |
257 |
-pkg_postinst() { |
258 |
- readme.gentoo_print_elog |
259 |
- |
260 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
261 |
- ewarn |
262 |
- ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker" |
263 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file" |
264 |
- ewarn "is now the common base directory for all instances. If you are migrating from an older" |
265 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
266 |
- ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
267 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
268 |
- ewarn " ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance" |
269 |
- ewarn " rc-update add buildbot_worker.myinstance default" |
270 |
- ewarn " /etc/init.d/buildbot_worker.myinstance start" |
271 |
- ewarn "Systems using systemd can do the following:" |
272 |
- ewarn " systemctl enable buildbot_worker@××××××××××.service" |
273 |
- ewarn " systemctl enable buildbot_worker.target" |
274 |
- ewarn " systemctl start buildbot_worker.target" |
275 |
- fi |
276 |
-} |
277 |
- |
278 |
-pkg_config() { |
279 |
- local buildworker_path="/var/lib/buildbot_worker" |
280 |
- local log_path="/var/log/buildbot_worker" |
281 |
- |
282 |
- einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}." |
283 |
- einfo "Press Control-C to abort." |
284 |
- |
285 |
- einfo "Enter the name for the new instance: " |
286 |
- read instance_name |
287 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
288 |
- |
289 |
- local instance_path="${buildworker_path}/${instance_name}" |
290 |
- local instance_log_path="${log_path}/${instance_name}" |
291 |
- |
292 |
- if [[ -e "${instance_path}" ]]; then |
293 |
- eerror "The instance with the specified name already exists:" |
294 |
- eerror "${instance_path}" |
295 |
- die "Instance already exists" |
296 |
- fi |
297 |
- |
298 |
- if [[ ! -d "${instance_path}" ]]; then |
299 |
- mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" |
300 |
- fi |
301 |
- chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" |
302 |
- cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \ |
303 |
- || die "Moving sample configuration failed" |
304 |
- ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \ |
305 |
- || die "Unable to create link to init file" |
306 |
- |
307 |
- if [[ ! -d "${instance_log_path}" ]]; then |
308 |
- mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}" |
309 |
- fi |
310 |
- ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \ |
311 |
- || die "Unable to create link to log file" |
312 |
- |
313 |
- einfo "Successfully created a buildbot_worker instance at ${instance_path}." |
314 |
- einfo "To change the default settings edit the buildbot.tac file in this directory." |
315 |
-} |
316 |
|
317 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild |
318 |
similarity index 80% |
319 |
rename from dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild |
320 |
rename to dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild |
321 |
index a8ac9da44f5..3bd934a5034 100644 |
322 |
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild |
323 |
+++ b/dev-util/buildbot-worker/buildbot-worker-2.8.0.ebuild |
324 |
@@ -1,35 +1,32 @@ |
325 |
# Copyright 1999-2020 Gentoo Authors |
326 |
# Distributed under the terms of the GNU General Public License v2 |
327 |
|
328 |
-EAPI="6" |
329 |
-PYTHON_COMPAT=( python3_6 ) |
330 |
+EAPI="7" |
331 |
+PYTHON_COMPAT=( python3_{6,7,8} ) |
332 |
|
333 |
-EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
334 |
+DISTUTILS_USE_SETUPTOOLS="rdepend" |
335 |
|
336 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
337 |
-inherit readme.gentoo-r1 user distutils-r1 |
338 |
+inherit readme.gentoo-r1 distutils-r1 |
339 |
|
340 |
DESCRIPTION="BuildBot Worker (slave) Daemon" |
341 |
HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/" |
342 |
|
343 |
MY_V="${PV/_p/.post}" |
344 |
MY_P="${PN}-${MY_V}" |
345 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
346 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
347 |
|
348 |
LICENSE="GPL-2" |
349 |
SLOT="0" |
350 |
-if [[ ${PV} == *9999 ]]; then |
351 |
- KEYWORDS="" |
352 |
-else |
353 |
- KEYWORDS="~amd64" |
354 |
-fi |
355 |
+KEYWORDS="~amd64" |
356 |
+ |
357 |
IUSE="test" |
358 |
RESTRICT="!test? ( test )" |
359 |
|
360 |
-RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
361 |
+RDEPEND=" |
362 |
+ acct-user/buildbot |
363 |
>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}] |
364 |
dev-python/future[${PYTHON_USEDEP}] |
365 |
- !<dev-util/buildbot-0.9.7 |
366 |
+ !<dev-util/buildbot-1.0.0 |
367 |
" |
368 |
DEPEND="${RDEPEND} |
369 |
test? ( |
370 |
@@ -39,25 +36,18 @@ DEPEND="${RDEPEND} |
371 |
" |
372 |
|
373 |
S="${WORKDIR}/${MY_P}" |
374 |
-[[ ${PV} == *9999 ]] && S=${S}/worker |
375 |
|
376 |
pkg_setup() { |
377 |
- enewuser buildbot |
378 |
- |
379 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added |
380 |
to support starting buildbot_worker through Gentoo's init system. To use this, |
381 |
execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
382 |
Set up your build worker following the documentation, make sure the |
383 |
resulting directories are owned by the \"buildbot\" user and point |
384 |
- \"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location. |
385 |
+ \"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location. |
386 |
The scripts can run as a different user if desired." |
387 |
} |
388 |
|
389 |
-python_test() { |
390 |
- distutils_install_for_testing |
391 |
- |
392 |
- esetup.py test || die "Tests failed under ${EPYTHON}" |
393 |
-} |
394 |
+distutils_enable_tests setup.py |
395 |
|
396 |
python_install_all() { |
397 |
distutils-r1_python_install_all |
398 |
@@ -78,8 +68,8 @@ pkg_postinst() { |
399 |
|
400 |
if [[ -n ${REPLACING_VERSIONS} ]]; then |
401 |
ewarn |
402 |
- ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker" |
403 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file" |
404 |
+ ewarn "More than one instance of a buildbot_worker can be run simultaneously." |
405 |
+ ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file" |
406 |
ewarn "is now the common base directory for all instances. If you are migrating from an older" |
407 |
ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
408 |
ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance." |
409 |
@@ -117,7 +107,7 @@ pkg_config() { |
410 |
if [[ ! -d "${instance_path}" ]]; then |
411 |
mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}" |
412 |
fi |
413 |
- chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" |
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 |
@@ -125,6 +115,8 @@ pkg_config() { |
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 |
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
429 |
index be5258cd998..68c35436d35 100644 |
430 |
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
431 |
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild |
432 |
@@ -8,7 +8,7 @@ EGIT_REPO_URI="https://github.com/buildbot/buildbot.git" |
433 |
|
434 |
DISTUTILS_USE_SETUPTOOLS="rdepend" |
435 |
|
436 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
437 |
+inherit git-r3 |
438 |
inherit readme.gentoo-r1 distutils-r1 |
439 |
|
440 |
DESCRIPTION="BuildBot Worker (slave) Daemon" |
441 |
@@ -16,15 +16,11 @@ HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pyp |
442 |
|
443 |
MY_V="${PV/_p/.post}" |
444 |
MY_P="${PN}-${MY_V}" |
445 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
446 |
|
447 |
LICENSE="GPL-2" |
448 |
SLOT="0" |
449 |
-if [[ ${PV} == *9999 ]]; then |
450 |
- KEYWORDS="" |
451 |
-else |
452 |
- KEYWORDS="~amd64" |
453 |
-fi |
454 |
+KEYWORDS="" |
455 |
+ |
456 |
IUSE="test" |
457 |
RESTRICT="!test? ( test )" |
458 |
|
459 |
@@ -41,8 +37,7 @@ DEPEND="${RDEPEND} |
460 |
) |
461 |
" |
462 |
|
463 |
-S="${WORKDIR}/${MY_P}" |
464 |
-[[ ${PV} == *9999 ]] && S=${S}/worker |
465 |
+S="${S}/worker" |
466 |
|
467 |
pkg_setup() { |
468 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added |