1 |
commit: 135e0346ef909039a06f22c73227ae031108f2f3 |
2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 7 19:52:48 2016 +0000 |
4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 7 20:17:40 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=135e0346 |
7 |
|
8 |
dev-util/buildbot: Version bump, clean up old releases |
9 |
|
10 |
Package-Manager: portage-2.3.1_p8 |
11 |
|
12 |
dev-util/buildbot/Manifest | 3 +- |
13 |
...t-0.9.0_rc2.ebuild => buildbot-0.9.0_p1.ebuild} | 13 +- |
14 |
dev-util/buildbot/buildbot-0.9.0_rc1-r2.ebuild | 201 --------------------- |
15 |
3 files changed, 3 insertions(+), 214 deletions(-) |
16 |
|
17 |
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest |
18 |
index 08742d8..3185666 100644 |
19 |
--- a/dev-util/buildbot/Manifest |
20 |
+++ b/dev-util/buildbot/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST buildbot-0.8.10.tar.gz 4822307 SHA256 c4964d2ebd81cb80a14cb058fb2aab0572a1d8d86672d514e775b42deb08a5f4 SHA512 e148a1670a56837587d858d1697fe117661cbbfedab42bf7be905f9e8e4266e4ff0170b0cd81aed61234d30497a05427061c3084033f09811d0bc306b200661b WHIRLPOOL 26397b6f914266201aba4feb4df7353facad4fd0f51bdf7e35cf25205c45eadcf83f24c265e540b13d327750ce9561362be6a5aa237152cf1298d970c504f76c |
23 |
DIST buildbot-0.8.12.tar.gz 4834352 SHA256 c6b66976dff712268566574d57131ec15e5682f6d4390cd5c8559bab0980c4d6 SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645 WHIRLPOOL 5754b7c0278fb5e7da8a7dd66253f6f4d12f54c125f6a78aa9018a2b6b22fd88a27e79e6821ab05e4cd9e87bf0dd08c3c73c7914d4c499ac13c48ca232ed21c8 |
24 |
-DIST buildbot-0.9.0rc1.tar.gz 3004783 SHA256 f089c4c6494c82ad8d42bf80a356eef62580054d864a9c8b2217adeeec53ba27 SHA512 4ec664f24f001c172d378d378ced95ad4507893a0f989178b078f4364fc9e52b2fb79196fc6f440f94f36cb14fd7b9e53530b4f5ee21fb81a0698789676be778 WHIRLPOOL 049f9c4efa37658bb2d5c9b04017f260c3d04e5b2df4a66eb3b3d99d6119343dcb5f78f50c8b00959932c323acf512729dbc5acd76d46eb418c6f120a8cba4b6 |
25 |
-DIST buildbot-0.9.0rc2.tar.gz 3007080 SHA256 b3b2fa1a004f6c3a83a0d1222da8d3d5279498030565de28247e8d28bf5cbf1b SHA512 122a0016bf35c409c30a9407164bb1058a0e3701f339d8fb01fc619b12f5ccfaf0de90070051f2d68e4fbfcd28174df031a8c5e8d339911490d3ee14f6ac5d32 WHIRLPOOL bc09cfc862f8f5756a2cdd5cc297e691537f52ecfcbd84532d4173b468727e3db32e983a19c18b788f0f3f98afb8ddc698efebb0994be57f315097d6b1c1b685 |
26 |
+DIST buildbot-0.9.0.post1.tar.gz 3013406 SHA256 afd8229c9fd33daa6d8227cd665c75b1b25c47ffcc4046ab5fd5b290ccd536a3 SHA512 0b171ca6ed15b15b4df23d0618cb7d98f6ae922efaa1e35a9458efaaf676b80a6ff3be36231b8ca31cadf89c3968425c560a0bff3630e8792d179462eba0da67 WHIRLPOOL e440826e4a027b42d28c0f3a0afca3c46ec5dc0b4d629fcef75de4b3350cffa2208e0024983f0ffebd1df38a5d860c6bd541fc1c3e28f8b6669ee93a4d4be8b4 |
27 |
DIST buildbot-0.9.0rc3.tar.gz 3012075 SHA256 ebdf4b3300d73a2bdc00b6c3fa24a9cc85d4a7a5c56b36c4dad15d40934543a0 SHA512 735702fb1959db52a724c13d6d8add28b43b392e9ccb2487f4d083ea6af0cc8557e19243bcad7cacde44aa5eac1cbca2e652290cd3cfaba83ce6651127c38786 WHIRLPOOL a8f962cb18dccfd8cef461a3caf32f89edbc7777dead8c04f4be125f320e200b306c5dd067bdd2e6a92336566bb39a0936a948c6192ebd61d0bdcee7bf13c584 |
28 |
|
29 |
diff --git a/dev-util/buildbot/buildbot-0.9.0_rc2.ebuild b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild |
30 |
similarity index 95% |
31 |
rename from dev-util/buildbot/buildbot-0.9.0_rc2.ebuild |
32 |
rename to dev-util/buildbot/buildbot-0.9.0_p1.ebuild |
33 |
index 239248c..bbe1768 100644 |
34 |
--- a/dev-util/buildbot/buildbot-0.9.0_rc2.ebuild |
35 |
+++ b/dev-util/buildbot/buildbot-0.9.0_p1.ebuild |
36 |
@@ -11,7 +11,7 @@ EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" |
37 |
[[ ${PV} == *9999 ]] && inherit git-r3 |
38 |
inherit readme.gentoo-r1 user systemd distutils-r1 |
39 |
|
40 |
-MY_V="0.9.0rc2" |
41 |
+MY_V="0.9.0.post1" |
42 |
MY_P="${PN}-${MY_V}" |
43 |
|
44 |
DESCRIPTION="BuildBot build automation system" |
45 |
@@ -33,6 +33,7 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
46 |
>=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
47 |
>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
48 |
) |
49 |
+ >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
50 |
>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] |
51 |
>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] |
52 |
crypt? ( |
53 |
@@ -58,16 +59,6 @@ RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
54 |
) |
55 |
dev-python/future[${PYTHON_USEDEP}] |
56 |
>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
57 |
- || ( |
58 |
- ( !<dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
59 |
- >=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}] |
60 |
- ) |
61 |
- ( || ( <dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
62 |
- dev-python/twisted-core[${PYTHON_USEDEP}] |
63 |
- ) |
64 |
- dev-python/autobahn[${PYTHON_USEDEP}] |
65 |
- ) |
66 |
- ) |
67 |
>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] |
68 |
" |
69 |
DEPEND="${RDEPEND} |
70 |
|
71 |
diff --git a/dev-util/buildbot/buildbot-0.9.0_rc1-r2.ebuild b/dev-util/buildbot/buildbot-0.9.0_rc1-r2.ebuild |
72 |
deleted file mode 100644 |
73 |
index be6322c..00000000 |
74 |
--- a/dev-util/buildbot/buildbot-0.9.0_rc1-r2.ebuild |
75 |
+++ /dev/null |
76 |
@@ -1,201 +0,0 @@ |
77 |
-# Copyright 1999-2016 Gentoo Foundation |
78 |
-# Distributed under the terms of the GNU General Public License v2 |
79 |
-# $Id$ |
80 |
- |
81 |
-EAPI="5" |
82 |
-PYTHON_REQ_USE="sqlite" |
83 |
-PYTHON_COMPAT=( python2_7 ) |
84 |
- |
85 |
-EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" |
86 |
- |
87 |
-[[ ${PV} == *9999 ]] && inherit git-r3 |
88 |
-inherit readme.gentoo-r1 user systemd distutils-r1 |
89 |
- |
90 |
-MY_PV="${PV/_p/p}" |
91 |
-MY_V="0.9.0rc1" |
92 |
-MY_P="${PN}-${MY_V}" |
93 |
- |
94 |
-DESCRIPTION="BuildBot build automation system" |
95 |
-HOMEPAGE="http://trac.buildbot.net/ https://github.com/buildbot/buildbot http://pypi.python.org/pypi/buildbot" |
96 |
-[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
97 |
- |
98 |
-LICENSE="GPL-2" |
99 |
-SLOT="0" |
100 |
-if [[ ${PV} == *9999 ]]; then |
101 |
- KEYWORDS="" |
102 |
-else |
103 |
- KEYWORDS="~amd64" |
104 |
-fi |
105 |
- |
106 |
-IUSE="crypt doc examples irc mail manhole test" |
107 |
- |
108 |
-RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}] |
109 |
- || ( |
110 |
- >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
111 |
- >=dev-python/twisted-16.0.0[${PYTHON_USEDEP}] |
112 |
- ) |
113 |
- >=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}] |
114 |
- >=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}] |
115 |
- crypt? ( |
116 |
- >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] |
117 |
- dev-python/idna[${PYTHON_USEDEP}] |
118 |
- dev-python/service_identity[${PYTHON_USEDEP}] |
119 |
- ) |
120 |
- irc? ( |
121 |
- || ( >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
122 |
- <dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
123 |
- ) |
124 |
- ) |
125 |
- mail? ( |
126 |
- || ( >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
127 |
- <dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
128 |
- ) |
129 |
- ) |
130 |
- manhole? ( |
131 |
- || ( >=dev-python/twisted-conch-14.0.1[${PYTHON_USEDEP}] |
132 |
- <dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
133 |
- ) |
134 |
- ) |
135 |
- dev-python/future[${PYTHON_USEDEP}] |
136 |
- >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
137 |
- >=dev-python/autobahn-0.10.2[${PYTHON_USEDEP}] |
138 |
- <dev-python/autobahn-0.13.0[${PYTHON_USEDEP}] |
139 |
- >=dev-python/txaio-2.2.2[${PYTHON_USEDEP}] |
140 |
- " |
141 |
-DEPEND="${RDEPEND} |
142 |
- >=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}] |
143 |
- doc? ( >=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}] ) |
144 |
- test? ( |
145 |
- >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}] |
146 |
- dev-python/mock[${PYTHON_USEDEP}] |
147 |
- || ( |
148 |
- ( |
149 |
- >=dev-python/twisted-mail-14.0.1[${PYTHON_USEDEP}] |
150 |
- >=dev-python/twisted-web-14.0.1[${PYTHON_USEDEP}] |
151 |
- >=dev-python/twisted-words-14.0.1[${PYTHON_USEDEP}] |
152 |
- ) |
153 |
- <dev-python/twisted-16.3.0[${PYTHON_USEDEP}] |
154 |
- ) |
155 |
- dev-python/moto[${PYTHON_USEDEP}] |
156 |
- dev-python/boto3[${PYTHON_USEDEP}] |
157 |
- dev-python/ramlfications[${PYTHON_USEDEP}] |
158 |
- dev-python/pyjade[${PYTHON_USEDEP}] |
159 |
- dev-python/txgithub[${PYTHON_USEDEP}] |
160 |
- dev-python/txrequests[${PYTHON_USEDEP}] |
161 |
- )" |
162 |
- |
163 |
-# still yet to be added deps |
164 |
-# doc? ( 'sphinxcontrib-blockdiag', |
165 |
-# 'sphinxcontrib-spelling', |
166 |
-# 'pyenchant', |
167 |
-# 'docutils>=0.8', |
168 |
-# 'sphinx-jinja',) |
169 |
- |
170 |
-S=${WORKDIR}/${MY_P} |
171 |
-[[ ${PV} == *9999 ]] && S=${S}/master |
172 |
- |
173 |
-pkg_setup() { |
174 |
- enewuser buildbot |
175 |
- |
176 |
- DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added |
177 |
- to support starting buildbot through Gentoo's init system. To use this, |
178 |
- execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance. |
179 |
- The scripts can run as a different user if desired." |
180 |
-} |
181 |
- |
182 |
-src_compile() { |
183 |
- distutils-r1_src_compile |
184 |
- |
185 |
- if use doc; then |
186 |
- einfo "Generation of documentation" |
187 |
- pushd docs > /dev/null |
188 |
- #'man' target is currently broken |
189 |
- emake html |
190 |
- popd > /dev/null |
191 |
- fi |
192 |
-} |
193 |
- |
194 |
-src_install() { |
195 |
- distutils-r1_src_install |
196 |
- |
197 |
- doman docs/buildbot.1 |
198 |
- |
199 |
- if use doc; then |
200 |
- dohtml -r docs/_build/html/ |
201 |
- # TODO: install man pages |
202 |
- fi |
203 |
- |
204 |
- if use examples; then |
205 |
- insinto /usr/share/doc/${PF} |
206 |
- doins -r contrib docs/examples |
207 |
- fi |
208 |
- |
209 |
- newconfd "${FILESDIR}/buildmaster.confd" buildmaster |
210 |
- newinitd "${FILESDIR}/buildmaster.initd" buildmaster |
211 |
- systemd_dounit "${FILESDIR}/buildmaster.target" |
212 |
- systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service" |
213 |
- systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service" |
214 |
- |
215 |
- readme.gentoo_create_doc |
216 |
-} |
217 |
- |
218 |
-pkg_postinst() { |
219 |
- readme.gentoo_print_elog |
220 |
- |
221 |
- if [[ -n ${REPLACING_VERSIONS} ]]; then |
222 |
- ewarn |
223 |
- ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster" |
224 |
- ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file" |
225 |
- ewarn "is now the common base directory for all instances. If you are migrating from an older" |
226 |
- ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory." |
227 |
- ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance." |
228 |
- ewarn "In order to start the service running OpenRC-based systems need to link to the init file:" |
229 |
- ewarn " ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance" |
230 |
- ewarn " rc-update add buildmaster.myinstance default" |
231 |
- ewarn " /etc/init.d/buildmaster.myinstance start" |
232 |
- ewarn "Systems using systemd can do the following:" |
233 |
- ewarn " systemctl enable buildmaster@××××××××××.service" |
234 |
- ewarn " systemctl enable buildmaster.target" |
235 |
- ewarn " systemctl start buildmaster.target" |
236 |
- elog |
237 |
- elog "Upstream recommends the following when upgrading:" |
238 |
- elog "Each time you install a new version of Buildbot, you should run the" |
239 |
- elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." |
240 |
- elog "This will add files and fix (or at least detect) incompatibilities between" |
241 |
- elog "your old config and the new code." |
242 |
- fi |
243 |
- elog |
244 |
- elog "In order to create a new instance of buildmaster, execute:" |
245 |
- elog " emerge --config =${CATEGORY}/${PF}" |
246 |
-} |
247 |
- |
248 |
-pkg_config() { |
249 |
- local buildmaster_path="/var/lib/buildmaster" |
250 |
- einfo "This will prepare a new buildmaster instance in ${buildmaster_path}." |
251 |
- einfo "Press Control-C to abort." |
252 |
- |
253 |
- einfo "Enter the name for the new instance: " |
254 |
- read instance_name |
255 |
- [[ -z "${instance_name}" ]] && die "Invalid instance name" |
256 |
- |
257 |
- local instance_path="${buildmaster_path}/${instance_name}" |
258 |
- if [[ -e "${instance_path}" ]]; then |
259 |
- eerror "The instance with the specified name already exists:" |
260 |
- eerror "${instance_path}" |
261 |
- die "Instance already exists" |
262 |
- fi |
263 |
- |
264 |
- local buildbot="/usr/bin/buildbot" |
265 |
- if [[ ! -d "${buildmaster_path}" ]]; then |
266 |
- mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}" |
267 |
- fi |
268 |
- "${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed" |
269 |
- chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed" |
270 |
- mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \ |
271 |
- || die "Moving sample configuration failed" |
272 |
- ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \ |
273 |
- || die "Unable to create link to init file" |
274 |
- |
275 |
- einfo "Successfully created a buildmaster instance at ${instance_path}." |
276 |
- einfo "To change the default settings edit the master.cfg file in this directory." |
277 |
-} |