1 |
hwoarang 13/09/30 19:25:02 |
2 |
|
3 |
Modified: buildbot-9999.ebuild ChangeLog |
4 |
Added: buildbot-0.8.8-r2.ebuild |
5 |
Removed: buildbot-0.8.8-r1.ebuild |
6 |
Log: |
7 |
Add reload() function to the init script. Update live ebuild. Bug #486586 |
8 |
|
9 |
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key C2BA7F3C!) |
10 |
|
11 |
Revision Changes Path |
12 |
1.2 dev-util/buildbot/buildbot-9999.ebuild |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/buildbot-9999.ebuild?rev=1.2&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/buildbot-9999.ebuild?rev=1.2&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/buildbot-9999.ebuild?r1=1.1&r2=1.2 |
17 |
|
18 |
Index: buildbot-9999.ebuild |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-9999.ebuild,v |
21 |
retrieving revision 1.1 |
22 |
retrieving revision 1.2 |
23 |
diff -u -r1.1 -r1.2 |
24 |
--- buildbot-9999.ebuild 11 Sep 2013 20:19:47 -0000 1.1 |
25 |
+++ buildbot-9999.ebuild 30 Sep 2013 19:25:02 -0000 1.2 |
26 |
@@ -1,6 +1,6 @@ |
27 |
# Copyright 1999-2013 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-9999.ebuild,v 1.1 2013/09/11 20:19:47 hwoarang Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-9999.ebuild,v 1.2 2013/09/30 19:25:02 hwoarang Exp $ |
31 |
|
32 |
EAPI="5" |
33 |
PYTHON_DEPEND="2" |
34 |
@@ -11,7 +11,7 @@ |
35 |
EGIT_REPO_URI="https://github.com/buildbot/${PN}.git" |
36 |
|
37 |
[[ ${PV} = 9999 ]] && inherit git-2 |
38 |
-inherit distutils readme.gentoo user |
39 |
+inherit distutils readme.gentoo user systemd |
40 |
|
41 |
MY_PV="${PV/_p/p}" |
42 |
MY_P="${PN}-${MY_PV}" |
43 |
@@ -95,6 +95,7 @@ |
44 |
|
45 |
newconfd "${FILESDIR}/buildmaster.confd" buildmaster |
46 |
newinitd "${FILESDIR}/buildmaster.initd" buildmaster |
47 |
+ systemd_dounit "${FILESDIR}"/${PN}.service |
48 |
|
49 |
# In case of multiple masters, it's possible to edit web files |
50 |
# so all master can share the changes. So protect them! |
51 |
|
52 |
|
53 |
|
54 |
1.142 dev-util/buildbot/ChangeLog |
55 |
|
56 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/ChangeLog?rev=1.142&view=markup |
57 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/ChangeLog?rev=1.142&content-type=text/plain |
58 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/ChangeLog?r1=1.141&r2=1.142 |
59 |
|
60 |
Index: ChangeLog |
61 |
=================================================================== |
62 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v |
63 |
retrieving revision 1.141 |
64 |
retrieving revision 1.142 |
65 |
diff -u -r1.141 -r1.142 |
66 |
--- ChangeLog 28 Sep 2013 10:34:03 -0000 1.141 |
67 |
+++ ChangeLog 30 Sep 2013 19:25:02 -0000 1.142 |
68 |
@@ -1,6 +1,12 @@ |
69 |
# ChangeLog for dev-util/buildbot |
70 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
71 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.141 2013/09/28 10:34:03 pacho Exp $ |
72 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/ChangeLog,v 1.142 2013/09/30 19:25:02 hwoarang Exp $ |
73 |
+ |
74 |
+*buildbot-0.8.8-r2 (30 Sep 2013) |
75 |
+ |
76 |
+ 30 Sep 2013; Markos Chandras <hwoarang@g.o> +buildbot-0.8.8-r2.ebuild, |
77 |
+ -buildbot-0.8.8-r1.ebuild, buildbot-9999.ebuild, files/buildmaster.initd: |
78 |
+ Add reload() function to the init script. Update live ebuild. Bug #486586 |
79 |
|
80 |
*buildbot-0.8.8-r1 (28 Sep 2013) |
81 |
|
82 |
|
83 |
|
84 |
|
85 |
1.1 dev-util/buildbot/buildbot-0.8.8-r2.ebuild |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/buildbot-0.8.8-r2.ebuild?rev=1.1&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/buildbot/buildbot-0.8.8-r2.ebuild?rev=1.1&content-type=text/plain |
89 |
|
90 |
Index: buildbot-0.8.8-r2.ebuild |
91 |
=================================================================== |
92 |
# Copyright 1999-2013 Gentoo Foundation |
93 |
# Distributed under the terms of the GNU General Public License v2 |
94 |
# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.8-r2.ebuild,v 1.1 2013/09/30 19:25:02 hwoarang Exp $ |
95 |
|
96 |
EAPI="5" |
97 |
PYTHON_DEPEND="2" |
98 |
SUPPORT_PYTHON_ABIS="1" |
99 |
RESTRICT_PYTHON_ABIS="3.* *-jython" |
100 |
DISTUTILS_SRC_TEST="trial" |
101 |
DISTUTILS_DISABLE_TEST_DEPENDENCY="1" |
102 |
|
103 |
inherit distutils readme.gentoo systemd user |
104 |
|
105 |
MY_PV="${PV/_p/p}" |
106 |
MY_P="${PN}-${MY_PV}" |
107 |
|
108 |
DESCRIPTION="BuildBot build automation system" |
109 |
HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot" |
110 |
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz" |
111 |
|
112 |
LICENSE="GPL-2" |
113 |
SLOT="0" |
114 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris" |
115 |
IUSE="doc examples irc mail manhole test" |
116 |
|
117 |
# sqlite3 module of Python 2.5 is not supported. |
118 |
RDEPEND=">=dev-python/jinja-2.1 |
119 |
|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson ) |
120 |
|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-python/pysqlite:2 ) |
121 |
>=dev-python/twisted-core-8.0.0 |
122 |
dev-python/twisted-web |
123 |
dev-python/sqlalchemy |
124 |
dev-python/sqlalchemy-migrate |
125 |
irc? ( dev-python/twisted-words ) |
126 |
mail? ( dev-python/twisted-mail ) |
127 |
manhole? ( dev-python/twisted-conch )" |
128 |
DEPEND="${DEPEND} |
129 |
dev-python/setuptools |
130 |
doc? ( sys-apps/texinfo ) |
131 |
test? ( |
132 |
dev-python/mock |
133 |
dev-python/twisted-mail |
134 |
dev-python/twisted-web |
135 |
dev-python/twisted-words |
136 |
)" |
137 |
|
138 |
S="${WORKDIR}/${MY_P}" |
139 |
|
140 |
pkg_setup() { |
141 |
python_pkg_setup |
142 |
enewuser buildbot |
143 |
|
144 |
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added |
145 |
to support starting buildbot through Gentoo's init system. To use this, |
146 |
set up your build master following the documentation, make sure the |
147 |
resulting directories are owned by the \"buildbot\" user and point |
148 |
\"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can |
149 |
run as a different user if desired. If you need to run more than one |
150 |
build master, just copy the scripts." |
151 |
} |
152 |
|
153 |
src_compile() { |
154 |
distutils_src_compile |
155 |
|
156 |
if use doc; then |
157 |
einfo "Generation of documentation" |
158 |
pushd docs > /dev/null |
159 |
emake buildbot.html buildbot.info |
160 |
popd > /dev/null |
161 |
fi |
162 |
} |
163 |
|
164 |
src_install() { |
165 |
distutils_src_install |
166 |
|
167 |
doman docs/buildbot.1 |
168 |
|
169 |
if use doc; then |
170 |
dohtml -r docs/buildbot.html docs/images |
171 |
doinfo docs/buildbot.info |
172 |
fi |
173 |
|
174 |
if use examples; then |
175 |
insinto /usr/share/doc/${PF} |
176 |
doins -r contrib docs/examples |
177 |
fi |
178 |
|
179 |
newconfd "${FILESDIR}/buildmaster.confd" buildmaster |
180 |
newinitd "${FILESDIR}/buildmaster.initd" buildmaster |
181 |
systemd_dounit "${FILESDIR}"/${PN}.service |
182 |
|
183 |
# In case of multiple masters, it's possible to edit web files |
184 |
# so all master can share the changes. So protect them! |
185 |
# If something else need to be protected, please open a bug |
186 |
# on http://bugs.gentoo.org |
187 |
local cp |
188 |
add_config_protect() { |
189 |
cp+=" $(python_get_sitedir)/${PN}/status/web" |
190 |
} |
191 |
python_execute_function -q add_config_protect |
192 |
echo "CONFIG_PROTECT=\"${cp}\"" \ |
193 |
> 85${PN} || die |
194 |
doenvd 85${PN} |
195 |
|
196 |
readme.gentoo_create_doc |
197 |
} |
198 |
|
199 |
pkg_postinst() { |
200 |
distutils_pkg_postinst |
201 |
readme.gentoo_print_elog |
202 |
elog |
203 |
elog "Upstream recommends the following when upgrading:" |
204 |
elog "Each time you install a new version of Buildbot, you should run the" |
205 |
elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters." |
206 |
elog "This will add files and fix (or at least detect) incompatibilities between" |
207 |
elog "your old config and the new code." |
208 |
} |