1 |
idl0r 12/01/01 01:13:34 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: monotone-1.0-r3.ebuild monotone-1.0-r2.ebuild |
5 |
monotone-0.99.1-r1.ebuild |
6 |
Removed: monotone-0.99.1.ebuild monotone-1.0.ebuild |
7 |
monotone-1.0-r1.ebuild |
8 |
Log: |
9 |
Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts variable, bug 386757. |
10 |
|
11 |
(Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force) |
12 |
|
13 |
Revision Changes Path |
14 |
1.21 dev-vcs/monotone/ChangeLog |
15 |
|
16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/ChangeLog?rev=1.21&view=markup |
17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/ChangeLog?rev=1.21&content-type=text/plain |
18 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/ChangeLog?r1=1.20&r2=1.21 |
19 |
|
20 |
Index: ChangeLog |
21 |
=================================================================== |
22 |
RCS file: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v |
23 |
retrieving revision 1.20 |
24 |
retrieving revision 1.21 |
25 |
diff -u -r1.20 -r1.21 |
26 |
--- ChangeLog 12 Sep 2011 10:41:42 -0000 1.20 |
27 |
+++ ChangeLog 1 Jan 2012 01:13:34 -0000 1.21 |
28 |
@@ -1,6 +1,16 @@ |
29 |
# ChangeLog for dev-vcs/monotone |
30 |
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
31 |
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.20 2011/09/12 10:41:42 pva Exp $ |
32 |
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
33 |
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/ChangeLog,v 1.21 2012/01/01 01:13:34 idl0r Exp $ |
34 |
+ |
35 |
+*monotone-1.0-r3 (01 Jan 2012) |
36 |
+*monotone-1.0-r2 (01 Jan 2012) |
37 |
+*monotone-0.99.1-r1 (01 Jan 2012) |
38 |
+ |
39 |
+ 01 Jan 2012; Christian Ruppert <idl0r@g.o> -monotone-0.99.1.ebuild, |
40 |
+ +monotone-0.99.1-r1.ebuild, -monotone-1.0.ebuild, -monotone-1.0-r1.ebuild, |
41 |
+ +monotone-1.0-r2.ebuild, +monotone-1.0-r3.ebuild, files/monotone-0.36.initd: |
42 |
+ Revbump. Don't use deprecated start-stop-daemon options and deprecated $opts |
43 |
+ variable, bug 386757. |
44 |
|
45 |
12 Sep 2011; Peter Volkov <pva@g.o> monotone-1.0-r1.ebuild: |
46 |
Fixed build with USE=doc, bug #380257 wrt Juergen Rose |
47 |
|
48 |
|
49 |
|
50 |
1.1 dev-vcs/monotone/monotone-1.0-r3.ebuild |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-1.0-r3.ebuild?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-1.0-r3.ebuild?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: monotone-1.0-r3.ebuild |
56 |
=================================================================== |
57 |
# Copyright 1999-2012 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r3.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $ |
60 |
|
61 |
# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/ |
62 |
EAPI="4" |
63 |
inherit bash-completion-r1 elisp-common eutils toolchain-funcs |
64 |
|
65 |
DESCRIPTION="Monotone Distributed Version Control System" |
66 |
HOMEPAGE="http://monotone.ca" |
67 |
SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2" |
68 |
|
69 |
LICENSE="GPL-2" |
70 |
SLOT="1" |
71 |
KEYWORDS="~amd64 ~ia64 ~x86" |
72 |
IUSE="doc ipv6 nls test" |
73 |
|
74 |
RDEPEND="sys-libs/zlib |
75 |
>=dev-libs/libpcre-7.6 |
76 |
>=dev-libs/botan-1.8.0 |
77 |
>=dev-db/sqlite-3.3.8 |
78 |
>=dev-lang/lua-5.1 |
79 |
net-dns/libidn" |
80 |
DEPEND="${RDEPEND} |
81 |
>=dev-libs/boost-1.33.1 |
82 |
nls? ( >=sys-devel/gettext-0.11.5 ) |
83 |
doc? ( sys-apps/texinfo ) |
84 |
test? ( dev-tcltk/expect |
85 |
app-shells/bash-completion )" |
86 |
|
87 |
pkg_setup() { |
88 |
enewgroup monotone |
89 |
enewuser monotone -1 -1 /var/lib/monotone monotone |
90 |
} |
91 |
|
92 |
src_prepare() { |
93 |
if [[ $(gcc-major-version) -lt "3" || |
94 |
( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then |
95 |
die 'requires >=gcc-3.4' |
96 |
fi |
97 |
epatch "${FILESDIR}/monotone-1.0-bash-completion-tests.patch" |
98 |
epatch "${FILESDIR}/monotone-1.0-botan-1.10.patch" |
99 |
} |
100 |
|
101 |
src_configure() { |
102 |
econf \ |
103 |
$(use_enable nls) \ |
104 |
$(use_enable ipv6) |
105 |
} |
106 |
|
107 |
src_compile() { |
108 |
emake |
109 |
use doc && emake html |
110 |
} |
111 |
|
112 |
src_test() { |
113 |
# Disables netsync_bind_opt test |
114 |
# https://code.monotone.ca/p/monotone/issues/179/ |
115 |
export DISABLE_NETWORK_TESTS=true |
116 |
if [[ ${UID} != 0 ]]; then |
117 |
emake check |
118 |
else |
119 |
ewarn "Tests will fail if ran as root, skipping." |
120 |
fi |
121 |
} |
122 |
|
123 |
src_install() { |
124 |
emake DESTDIR="${D}" install |
125 |
|
126 |
mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die |
127 |
|
128 |
rm "${ED}"/etc/bash_completion.d/monotone.bash_completion || die |
129 |
newbashcomp extra/shell/monotone.bash_completion ${PN} |
130 |
|
131 |
if use doc; then |
132 |
dohtml -r doc/html/* |
133 |
dohtml -r doc/figures |
134 |
fi |
135 |
|
136 |
dodoc AUTHORS NEWS README* UPGRADE |
137 |
docinto contrib |
138 |
docompress -x /usr/share/doc/${PF}/contrib |
139 |
dodoc -r contrib |
140 |
newconfd "${FILESDIR}"/monotone.confd monotone |
141 |
newinitd "${FILESDIR}"/${PN}-0.36.initd monotone |
142 |
|
143 |
insinto /etc/monotone |
144 |
newins "${FILESDIR}"/hooks.lua hooks.lua |
145 |
newins "${FILESDIR}"/read-permissions read-permissions |
146 |
newins "${FILESDIR}"/write-permissions write-permissions |
147 |
|
148 |
keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone |
149 |
fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone |
150 |
} |
151 |
|
152 |
pkg_postinst() { |
153 |
elog |
154 |
elog "For details and instructions to upgrade from previous versions," |
155 |
elog "please read /usr/share/doc/${PF}/UPGRADE.bz2" |
156 |
elog |
157 |
elog " 1. edit /etc/conf.d/monotone" |
158 |
elog " 2. import the first keys to enable access with" |
159 |
elog " env HOME=\${homedir} mtn pubkey me@×××××××.net | /etc/init.d/monotone import" |
160 |
elog " Thereafter, those with write permission can add other keys via" |
161 |
elog " netsync with 'monotone push --key-to-push=IDENT' and then IDENT" |
162 |
elog " can be used in the read-permission and write-permission files." |
163 |
elog " 3. adjust permisions in /etc/monotone/read-permissions" |
164 |
elog " and /etc/monotone/write-permissions" |
165 |
elog " 4. start the daemon: /etc/init.d/monotone start" |
166 |
elog " 5. make persistent: rc-update add monotone default" |
167 |
elog |
168 |
} |
169 |
|
170 |
|
171 |
|
172 |
1.1 dev-vcs/monotone/monotone-1.0-r2.ebuild |
173 |
|
174 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild?rev=1.1&view=markup |
175 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild?rev=1.1&content-type=text/plain |
176 |
|
177 |
Index: monotone-1.0-r2.ebuild |
178 |
=================================================================== |
179 |
# Copyright 1999-2012 Gentoo Foundation |
180 |
# Distributed under the terms of the GNU General Public License v2 |
181 |
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-1.0-r2.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $ |
182 |
|
183 |
# QA failiures reported in https://code.monotone.ca/p/monotone/issues/181/ |
184 |
EAPI="4" |
185 |
inherit bash-completion elisp-common eutils toolchain-funcs |
186 |
|
187 |
DESCRIPTION="Monotone Distributed Version Control System" |
188 |
HOMEPAGE="http://monotone.ca" |
189 |
SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.bz2" |
190 |
|
191 |
LICENSE="GPL-2" |
192 |
SLOT="1" |
193 |
KEYWORDS="~amd64 ~ia64 ~x86" |
194 |
IUSE="doc emacs ipv6 nls test" |
195 |
|
196 |
RDEPEND="sys-libs/zlib |
197 |
emacs? ( virtual/emacs ) |
198 |
>=dev-libs/libpcre-7.6 |
199 |
>=dev-libs/botan-1.8.0 |
200 |
>=dev-db/sqlite-3.3.8 |
201 |
>=dev-lang/lua-5.1 |
202 |
net-dns/libidn" |
203 |
DEPEND="${RDEPEND} |
204 |
>=dev-libs/boost-1.33.1 |
205 |
nls? ( >=sys-devel/gettext-0.11.5 ) |
206 |
doc? ( sys-apps/texinfo ) |
207 |
test? ( dev-tcltk/expect |
208 |
app-shells/bash-completion )" |
209 |
|
210 |
pkg_setup() { |
211 |
enewgroup monotone |
212 |
enewuser monotone -1 -1 /var/lib/monotone monotone |
213 |
} |
214 |
|
215 |
src_prepare() { |
216 |
if [[ $(gcc-major-version) -lt "3" || |
217 |
( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then |
218 |
die 'requires >=gcc-3.4' |
219 |
fi |
220 |
epatch "${FILESDIR}/monotone-1.0-bash-completion-tests.patch" |
221 |
epatch "${FILESDIR}/monotone-1.0-botan-1.10.patch" |
222 |
} |
223 |
|
224 |
src_configure() { |
225 |
econf \ |
226 |
$(use_enable nls) \ |
227 |
$(use_enable ipv6) |
228 |
} |
229 |
|
230 |
src_compile() { |
231 |
emake |
232 |
|
233 |
use doc && emake html |
234 |
|
235 |
if use emacs; then |
236 |
cd contrib || die |
237 |
elisp-compile *.el || die |
238 |
fi |
239 |
} |
240 |
|
241 |
src_test() { |
242 |
# Disables netsync_bind_opt test |
243 |
# https://code.monotone.ca/p/monotone/issues/179/ |
244 |
export DISABLE_NETWORK_TESTS=true |
245 |
if [[ ${UID} != 0 ]]; then |
246 |
emake check |
247 |
else |
248 |
ewarn "Tests will fail if ran as root, skipping." |
249 |
fi |
250 |
} |
251 |
|
252 |
src_install() { |
253 |
emake DESTDIR="${D}" install |
254 |
|
255 |
mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die |
256 |
|
257 |
dobashcompletion contrib/monotone.bash_completion |
258 |
|
259 |
if use doc; then |
260 |
dohtml -r html/* |
261 |
dohtml -r figures |
262 |
fi |
263 |
|
264 |
if use emacs; then |
265 |
elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed" |
266 |
elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \ |
267 |
|| die |
268 |
fi |
269 |
|
270 |
dodoc AUTHORS NEWS README* UPGRADE |
271 |
docinto contrib |
272 |
docompress -x /usr/share/doc/${PF}/contrib |
273 |
dodoc -r contrib |
274 |
newconfd "${FILESDIR}"/monotone.confd monotone |
275 |
newinitd "${FILESDIR}"/${PN}-0.36.initd monotone |
276 |
|
277 |
insinto /etc/monotone |
278 |
newins "${FILESDIR}"/hooks.lua hooks.lua |
279 |
newins "${FILESDIR}"/read-permissions read-permissions |
280 |
newins "${FILESDIR}"/write-permissions write-permissions |
281 |
|
282 |
keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone |
283 |
fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone |
284 |
} |
285 |
|
286 |
pkg_postinst() { |
287 |
use emacs && elisp-site-regen |
288 |
bash-completion_pkg_postinst |
289 |
|
290 |
elog |
291 |
elog "For details and instructions to upgrade from previous versions," |
292 |
elog "please read /usr/share/doc/${PF}/UPGRADE.bz2" |
293 |
elog |
294 |
elog " 1. edit /etc/conf.d/monotone" |
295 |
elog " 2. import the first keys to enable access with" |
296 |
elog " env HOME=\${homedir} mtn pubkey me@×××××××.net | /etc/init.d/monotone import" |
297 |
elog " Thereafter, those with write permission can add other keys via" |
298 |
elog " netsync with 'monotone push --key-to-push=IDENT' and then IDENT" |
299 |
elog " can be used in the read-permission and write-permission files." |
300 |
elog " 3. adjust permisions in /etc/monotone/read-permissions" |
301 |
elog " and /etc/monotone/write-permissions" |
302 |
elog " 4. start the daemon: /etc/init.d/monotone start" |
303 |
elog " 5. make persistent: rc-update add monotone default" |
304 |
elog |
305 |
} |
306 |
|
307 |
pkg_postrm() { |
308 |
use emacs && elisp-site-regen |
309 |
} |
310 |
|
311 |
|
312 |
|
313 |
1.1 dev-vcs/monotone/monotone-0.99.1-r1.ebuild |
314 |
|
315 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-0.99.1-r1.ebuild?rev=1.1&view=markup |
316 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/monotone/monotone-0.99.1-r1.ebuild?rev=1.1&content-type=text/plain |
317 |
|
318 |
Index: monotone-0.99.1-r1.ebuild |
319 |
=================================================================== |
320 |
# Copyright 1999-2012 Gentoo Foundation |
321 |
# Distributed under the terms of the GNU General Public License v2 |
322 |
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/monotone/monotone-0.99.1-r1.ebuild,v 1.1 2012/01/01 01:13:34 idl0r Exp $ |
323 |
|
324 |
EAPI="4" |
325 |
inherit bash-completion elisp-common eutils toolchain-funcs |
326 |
|
327 |
DESCRIPTION="Monotone Distributed Version Control System" |
328 |
HOMEPAGE="http://monotone.ca" |
329 |
SRC_URI="http://monotone.ca/downloads/${PV}/${P}.tar.gz" |
330 |
|
331 |
LICENSE="GPL-2" |
332 |
SLOT="1" |
333 |
KEYWORDS="amd64 ~ia64 x86" |
334 |
IUSE="doc emacs ipv6 nls" |
335 |
|
336 |
RDEPEND="sys-libs/zlib |
337 |
emacs? ( virtual/emacs ) |
338 |
>=dev-libs/libpcre-7.6 |
339 |
>=dev-libs/botan-1.8.0 |
340 |
<dev-libs/botan-1.10 |
341 |
>=dev-db/sqlite-3.3.8 |
342 |
>=dev-lang/lua-5.1 |
343 |
net-dns/libidn" |
344 |
DEPEND="${RDEPEND} |
345 |
>=dev-libs/boost-1.33.1 |
346 |
nls? ( >=sys-devel/gettext-0.11.5 ) |
347 |
doc? ( sys-apps/texinfo )" |
348 |
|
349 |
pkg_setup() { |
350 |
enewgroup monotone |
351 |
enewuser monotone -1 -1 /var/lib/monotone monotone |
352 |
} |
353 |
|
354 |
src_prepare() { |
355 |
if [[ $(gcc-major-version) -lt "3" || |
356 |
( $(gcc-major-version) -eq "3" && $(gcc-minor-version) -le 3 ) ]]; then |
357 |
die 'requires >=gcc-3.4' |
358 |
fi |
359 |
} |
360 |
|
361 |
src_configure() { |
362 |
econf \ |
363 |
$(use_enable nls) \ |
364 |
$(use_enable ipv6) |
365 |
} |
366 |
|
367 |
src_compile() { |
368 |
emake || die |
369 |
|
370 |
if use doc; then |
371 |
emake html || die |
372 |
fi |
373 |
|
374 |
if use emacs; then |
375 |
cd contrib |
376 |
elisp-compile *.el || die |
377 |
fi |
378 |
} |
379 |
|
380 |
src_test() { |
381 |
if [ ${UID} != 0 ]; then |
382 |
emake check || die "emake check failed" |
383 |
else |
384 |
ewarn "Tests will fail if ran as root, skipping." |
385 |
fi |
386 |
} |
387 |
|
388 |
src_install() { |
389 |
emake DESTDIR="${D}" install || die |
390 |
|
391 |
mv "${ED}"/usr/share/doc/${PN} "${ED}"/usr/share/doc/${PF} || die |
392 |
|
393 |
dobashcompletion contrib/monotone.bash_completion |
394 |
|
395 |
if use doc; then |
396 |
dohtml -r html/* |
397 |
dohtml -r figures |
398 |
fi |
399 |
|
400 |
if use emacs; then |
401 |
elisp-install ${PN} contrib/*.{el,elc} || die "elisp-install failed" |
402 |
elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el \ |
403 |
|| die |
404 |
fi |
405 |
|
406 |
dodoc AUTHORS NEWS README* UPGRADE |
407 |
docinto contrib |
408 |
docompress -x /usr/share/doc/${PF}/contrib |
409 |
dodoc -r contrib |
410 |
newconfd "${FILESDIR}"/monotone.confd monotone |
411 |
newinitd "${FILESDIR}"/${PN}-0.36.initd monotone |
412 |
|
413 |
insinto /etc/monotone |
414 |
newins "${FILESDIR}"/hooks.lua hooks.lua |
415 |
newins "${FILESDIR}"/read-permissions read-permissions |
416 |
newins "${FILESDIR}"/write-permissions write-permissions |
417 |
|
418 |
keepdir /var/lib/monotone/keys/ /var/{log,run}/monotone |
419 |
fowners monotone:monotone /var/lib/monotone{,/keys} /var/{log,run}/monotone |
420 |
} |
421 |
|
422 |
pkg_postinst() { |
423 |
use emacs && elisp-site-regen |
424 |
bash-completion_pkg_postinst |
425 |
|
426 |
elog |
427 |
elog "For details and instructions to upgrade from previous versions," |
428 |
elog "please read /usr/share/doc/${PF}/UPGRADE.bz2" |
429 |
elog |
430 |
elog " 1. edit /etc/conf.d/monotone" |
431 |
elog " 2. import the first keys to enable access with" |
432 |
elog " env HOME=\${homedir} mtn pubkey me@×××××××.net | /etc/init.d/monotone import" |
433 |
elog " Thereafter, those with write permission can add other keys via" |
434 |
elog " netsync with 'monotone push --key-to-push=IDENT' and then IDENT" |
435 |
elog " can be used in the read-permission and write-permission files." |
436 |
elog " 3. adjust permisions in /etc/monotone/read-permissions" |
437 |
elog " and /etc/monotone/write-permissions" |
438 |
elog " 4. start the daemon: /etc/init.d/monotone start" |
439 |
elog " 5. make persistent: rc-update add monotone default" |
440 |
elog |
441 |
} |
442 |
|
443 |
pkg_postrm() { |
444 |
use emacs && elisp-site-regen |
445 |
} |