Merge lp:~gagern/bzr-gentoo-overlay/bump into lp:bzr-gentoo-overlay
- bump
- Merge into overlay-main
Proposed by
Martin von Gagern
Status: | Merged |
---|---|
Merged at revision: | 374 |
Proposed branch: | lp:~gagern/bzr-gentoo-overlay/bump |
Merge into: | lp:bzr-gentoo-overlay |
Diff against target: |
488 lines (+375/-10) 16 files modified
.bzrignore (+1/-0) Tools/bzr.ini (+77/-0) Tools/checkbump.py (+184/-0) Tools/checkbump.sh (+7/-0) dev-python/pyftpdlib/ChangeLog (+10/-0) dev-python/pyftpdlib/Manifest (+3/-2) dev-python/pyftpdlib/pyftpdlib-0.6.0.ebuild (+1/-1) dev-vcs/bzr-explorer/Manifest (+3/-0) dev-vcs/bzr-explorer/bzr-explorer-1.1.2.ebuild (+31/-0) dev-vcs/bzr-explorer/metadata.xml (+12/-0) dev-vcs/bzr-git/Manifest (+2/-0) dev-vcs/bzr-git/bzr-git-0.5.4.ebuild (+37/-0) www-apps/loggerhead/Manifest (+2/-2) www-apps/loggerhead/loggerhead-1.18.ebuild (+2/-2) www-apps/trac-bzr/Manifest (+2/-2) www-apps/trac-bzr/trac-bzr-0.4.2.ebuild (+1/-1) |
To merge this branch: | bzr merge lp:~gagern/bzr-gentoo-overlay/bump |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Christian Faulhammer | Approve | ||
Review via email:
|
Commit message
Description of the change
Configured checkbump, and bumped a number of packages.
To post a comment you must log in.
- 382. By Martin von Gagern
-
dev-vcs/
bzr-explorer: keyword for testing - 383. By Martin von Gagern
-
dev-vcs/bzr-git: keyword for testing
Revision history for this message

Martin von Gagern (gagern) wrote : | # |
Then simply merge up to 379, and we'll avoid cluttering the history with the extra bumps.
Revision history for this message

Christian Faulhammer (fauli) wrote : | # |
Of course...done.
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === added file '.bzrignore' |
2 | --- .bzrignore 1970-01-01 00:00:00 +0000 |
3 | +++ .bzrignore 2011-02-12 15:51:31 +0000 |
4 | @@ -0,0 +1,1 @@ |
5 | +Tools/bzr.html |
6 | |
7 | === added directory 'Tools' |
8 | === added file 'Tools/bzr.ini' |
9 | --- Tools/bzr.ini 1970-01-01 00:00:00 +0000 |
10 | +++ Tools/bzr.ini 2011-02-12 15:51:31 +0000 |
11 | @@ -0,0 +1,77 @@ |
12 | +[dev-vcs/bzr] |
13 | +url = http://bazaar.canonical.com/en/ |
14 | +command = grep ' version: </th><td>[0-9][-_0-9.a-z]*</td>' | sed -e 's:.*<td>\([0-9][-_0-9.a-z]*\)</td>.*:\1:' |
15 | + |
16 | +# Launchpad packages with 'Latest version' line on front page |
17 | + |
18 | +[app-vim/bzr-vim] |
19 | +url = https://launchpad.net/bzr-vim |
20 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
21 | + |
22 | +[dev-vcs/bzr-config] |
23 | +url = https://launchpad.net/bzr-config |
24 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
25 | + |
26 | +[dev-vcs/bzr-explorer] |
27 | +url = https://launchpad.net/bzr-explorer |
28 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
29 | + |
30 | +[dev-vcs/bzr-git] |
31 | +url = https://launchpad.net/bzr-git |
32 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
33 | + |
34 | +[dev-vcs/bzr-gtk] |
35 | +url = https://launchpad.net/bzr-gtk |
36 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
37 | + |
38 | +[dev-vcs/bzr-hg] |
39 | +url = https://launchpad.net/bzr-hg |
40 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
41 | + |
42 | +[dev-vcs/bzr-loom] |
43 | +url = https://launchpad.net/bzr-loom |
44 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
45 | + |
46 | +[dev-vcs/bzr-pager] |
47 | +url = https://launchpad.net/bzr-pager |
48 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
49 | + |
50 | +[dev-vcs/bzr-rewrite] |
51 | +url = https://launchpad.net/bzr-rewrite |
52 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
53 | + |
54 | +[dev-vcs/bzr-svn] |
55 | +url = https://launchpad.net/bzr-svn |
56 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
57 | + |
58 | +[dev-vcs/bzr-xmloutput] |
59 | +url = https://launchpad.net/bzr-xmloutput |
60 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
61 | + |
62 | +[dev-vcs/bzrtools] |
63 | +url = https://launchpad.net/bzrtools |
64 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
65 | + |
66 | +[www-apps/loggerhead] |
67 | +url = https://launchpad.net/loggerhead |
68 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
69 | + |
70 | +[www-apps/trac-bzr] |
71 | +url = https://launchpad.net/trac-bzr |
72 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
73 | + |
74 | +[x11-plugins/bzr-gedit] |
75 | +url = https://launchpad.net/bzr-gedit |
76 | +command = grep 'Latest version is' | sed -e 's:.* \([0-9][^ \n\r\t<]*\).*:\1:' |
77 | + |
78 | +# Google code packages |
79 | + |
80 | +[dev-python/pyftpdlib] |
81 | +url = http://code.google.com/p/pyftpdlib/downloads/list |
82 | +command = grep -e '<a href="http://pyftpdlib.googlecode.com/files/pyftpdlib-[0-9][^ ]*\.tar\.gz"' | head -n1 | sed -e 's:.*pyftpdlib-\([0-9][^ ]*\)\.tar\.gz.*:\1:' |
83 | + |
84 | +# Other packages |
85 | + |
86 | +[dev-python/pykerberos] |
87 | +url = http://trac.calendarserver.org/browser/PyKerberos/tags/release |
88 | +command = grep -E 'href="/browser/PyKerberos/tags/release/PyKerberos-.*">PyKerberos-' | tail -n1 | sed 's:.*/PyKerberos-\([^"><]*\)".*:\1:' |
89 | |
90 | === added file 'Tools/checkbump.py' |
91 | --- Tools/checkbump.py 1970-01-01 00:00:00 +0000 |
92 | +++ Tools/checkbump.py 2011-02-12 15:51:31 +0000 |
93 | @@ -0,0 +1,184 @@ |
94 | +#!/usr/bin/env python |
95 | +# -*- coding: utf-8 -*- |
96 | +""" |
97 | + checkbump.py |
98 | + ~~~~~~~~~~~~ |
99 | + |
100 | + Version bump checker for Gentoo Linux packages. |
101 | + Depends on Jinja2. |
102 | + |
103 | + :copyright: (c) 2010 by Rafael Goncalves Martins |
104 | + :license: BSD (http://www.opensource.org/licenses/bsd-license.php) |
105 | +""" |
106 | + |
107 | +import os, sys |
108 | + |
109 | +# force "~*" keywords |
110 | +if not 'ACCEPT_KEYWORDS' in os.environ: |
111 | + os.environ['ACCEPT_KEYWORDS'] = '~*' |
112 | + |
113 | +# ignore overlays |
114 | +if not 'PORTDIR_OVERLAY' in os.environ: |
115 | + os.environ['PORTDIR_OVERLAY'] = '' |
116 | + |
117 | +from ConfigParser import ConfigParser |
118 | +from contextlib import closing |
119 | +from datetime import datetime |
120 | +from jinja2 import Template |
121 | +from logging import getLogger, Formatter, StreamHandler, INFO |
122 | +from portage import portagetree |
123 | +from portage.versions import pkgsplit, vercmp |
124 | +from subprocess import Popen, PIPE |
125 | +from time import strftime |
126 | +from urllib2 import urlopen, URLError |
127 | + |
128 | +# logging formatters |
129 | +LOG_FORMATTER = "[%(asctime)s] %(name)s.%(levelname)s: %(message)s" |
130 | +LOG_DATEFORMAT = "%Y-%m-%d %H:%M:%S %Z" |
131 | + |
132 | +HTML_TEMPLATE = Template("""\ |
133 | +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" |
134 | + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> |
135 | +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> |
136 | + <head> |
137 | + <title>Version bump checker - {{ config_file }}</title> |
138 | + <meta http-equiv="content-type" content="text/html;charset=utf-8" /> |
139 | + </head> |
140 | + <body> |
141 | + <h1>Version bump checker</h1> |
142 | + <h2>{{ config_file }}</h2> |
143 | + <table border="1"> |
144 | + <tr> |
145 | + <th>Package</th> |
146 | + <th>Bugs</th> |
147 | + <th>Gentoo version</th> |
148 | + <th>Upstream version</th> |
149 | + <th>Up-to-date?</th> |
150 | + </tr> |
151 | + {%- for package in packages %} |
152 | + <tr> |
153 | + <td><a href="{{ package.url }}">{{ package.atom }}</a></td> |
154 | + <td><a href="http://bugs.gentoo.org/buglist.cgi?quicksearch={{ package.atom }}">Bugs</a></td> |
155 | + {%- if package.error %} |
156 | + <td colspan="3">Failed!</td> |
157 | + {%- else %} |
158 | + <td>{{ package.gentoo_version }}</td> |
159 | + <td>{{ package.upstream_version }}</td> |
160 | + <td bgcolor="{{ package.up2date and 'green">yes' or 'red">no' }}</td> |
161 | + {%- endif %} |
162 | + </tr> |
163 | + {%- else %} |
164 | + <tr> |
165 | + <td colspan="5">No packages available!</td> |
166 | + </tr> |
167 | + {%- endfor %} |
168 | + </table> |
169 | + <hr /> |
170 | + <p>Last update: {{ last_update }}</p> |
171 | + </body> |
172 | +</html> |
173 | +""") |
174 | + |
175 | +# setup logging |
176 | +logger = getLogger('checkbump') |
177 | +logger.setLevel(INFO) |
178 | +_log_handler = StreamHandler(sys.stderr) |
179 | +_log_handler.setFormatter(Formatter(LOG_FORMATTER, LOG_DATEFORMAT)) |
180 | +logger.addHandler(_log_handler) |
181 | + |
182 | + |
183 | +class Package(object): |
184 | + |
185 | + error = False |
186 | + |
187 | + def __init__(self, atom, url): |
188 | + self.atom = atom |
189 | + self.url = url |
190 | + self.upstream_version = '' |
191 | + try: |
192 | + with closing(urlopen(url)) as fp: |
193 | + self._content = fp.read() |
194 | + except URLError, err: |
195 | + self.error = True |
196 | + logger.error('fetch failed %r - %r' % (atom, err.reason)) |
197 | + |
198 | + @property |
199 | + def gentoo_version(self): |
200 | + if not self.error: |
201 | + portage = portagetree() |
202 | + versions = portage.dep_match(self.atom) |
203 | + versions = [v for v in versions if not v.endswith('-9999')] |
204 | + if len(versions) == 0: |
205 | + raise Exception('package not found %r' % self.atom) |
206 | + last_atom = versions[-1] |
207 | + cp, pv, rev = pkgsplit(last_atom) |
208 | + return pv |
209 | + |
210 | + @property |
211 | + def up2date(self): |
212 | + if not self.error: |
213 | + return vercmp(self.gentoo_version, self.upstream_version) == 0 |
214 | + |
215 | + def run_command(self, command): |
216 | + if not self.error: |
217 | + p = Popen(command, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE) |
218 | + stdout, stderr = p.communicate(self._content) |
219 | + if p.returncode != os.EX_OK: |
220 | + raise Exception('command failed: %r' % command) |
221 | + self.upstream_version += stdout.strip() |
222 | + |
223 | + |
224 | +class PackageList(list): |
225 | + |
226 | + def __init__(self, ini_file): |
227 | + self._parser = ConfigParser() |
228 | + parsed_file = self._parser.read(ini_file) |
229 | + if not len(parsed_file) == 1: |
230 | + raise Exception('failed to load config %r' % ini_file) |
231 | + list.__init__(self) |
232 | + atoms = self._parser.sections() |
233 | + atoms.sort() |
234 | + for atom in atoms: |
235 | + logger.info('fetching %r' % atom) |
236 | + url = None |
237 | + commands = None |
238 | + for name, value in self._parser.items(atom): |
239 | + if name == 'url': |
240 | + url = value |
241 | + elif name == 'command': |
242 | + commands = value |
243 | + if url is None or commands is None: |
244 | + raise Exception('invalid url/command %r' % atom) |
245 | + package = Package(atom, url) |
246 | + for command in commands.split('\n'): |
247 | + package.run_command(command.strip()) |
248 | + self.append(package) |
249 | + |
250 | + |
251 | +def generate_html(config_file, pkg_list): |
252 | + logger.info('generating html') |
253 | + return HTML_TEMPLATE.render( |
254 | + config_file = config_file, |
255 | + packages = pkg_list, |
256 | + last_update = strftime(LOG_DATEFORMAT) |
257 | + ) |
258 | + |
259 | + |
260 | +def main(argv): |
261 | + logger.info('starting ...') |
262 | + if len(argv) != 1: |
263 | + logger.error('invalid number of arguments.') |
264 | + return 1 |
265 | + pkg_list = PackageList(argv[0]) |
266 | + config_file = os.path.splitext(os.path.basename(argv[0]))[0] |
267 | + sys.stdout.write(generate_html(config_file, pkg_list)) |
268 | + return 0 |
269 | + |
270 | + |
271 | +if __name__ == '__main__': |
272 | + try: |
273 | + sys.exit(main(sys.argv[1:])) |
274 | + except KeyboardInterrupt: |
275 | + logger.info('interrupted.') |
276 | + except Exception, err: |
277 | + logger.error(str(err)) |
278 | |
279 | === added file 'Tools/checkbump.sh' |
280 | --- Tools/checkbump.sh 1970-01-01 00:00:00 +0000 |
281 | +++ Tools/checkbump.sh 2011-02-12 15:51:31 +0000 |
282 | @@ -0,0 +1,7 @@ |
283 | +#!/bin/bash |
284 | + |
285 | +cd "$(dirname "$0")" |
286 | +export PORTDIR_OVERLAY="$(cd ..; pwd)" |
287 | +export ACCEPT_KEYWORDS="**" |
288 | +python2 checkbump.py bzr.ini > bzr.html |
289 | +echo "Created file://${PWD}/bzr.html" |
290 | |
291 | === added file 'dev-python/pyftpdlib/ChangeLog' |
292 | --- dev-python/pyftpdlib/ChangeLog 1970-01-01 00:00:00 +0000 |
293 | +++ dev-python/pyftpdlib/ChangeLog 2011-02-12 15:51:31 +0000 |
294 | @@ -0,0 +1,10 @@ |
295 | +# ChangeLog for dev-python/pyftpdlib |
296 | +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
297 | +# $Header: $ |
298 | + |
299 | +*pyftpdlib-0.6.0 (12 Feb 2011) |
300 | + |
301 | + 12 Feb 2011; Martin von Gagern (MvG) <Martin.vGagern@gmx.net> |
302 | + -pyftpdlib-0.5.2.ebuild, +pyftpdlib-0.6.0.ebuild: |
303 | + Version bump. |
304 | + |
305 | |
306 | === modified file 'dev-python/pyftpdlib/Manifest' |
307 | --- dev-python/pyftpdlib/Manifest 2010-12-20 18:30:27 +0000 |
308 | +++ dev-python/pyftpdlib/Manifest 2011-02-12 15:51:31 +0000 |
309 | @@ -1,3 +1,4 @@ |
310 | -DIST pyftpdlib-0.5.2.tar.gz 108432 RMD160 19a85293d5cc7eb2c4137bab278138397fd553ad SHA1 183950a9c239b23542dc880ff3a27d9fe5da63af SHA256 c24ebd1764c9e4b3d0eceec81d467601fd421bc45eaee5aab09ceb68d9995b4c |
311 | -EBUILD pyftpdlib-0.5.2.ebuild 429 RMD160 d80f7fc6737ec6cd1c508467400af9c1b2a8de1f SHA1 002cf0c189742abe235bb84251a37c38d58636af SHA256 537635a6fd746be4215b0a0fdc7d9b1b3d718914af39d143bf6ec2b9351c5329 |
312 | +DIST pyftpdlib-0.6.0.tar.gz 128878 RMD160 f75eba4ba97e896ad2bf73b7d0aac1895154106f SHA1 bbff5e000f59ddc947c1ba128b238b52ac70d52f SHA256 547afb8bca676e508dbb15c42a9fd3f5af6bdc289781a4c22abd007f74e9936a |
313 | +EBUILD pyftpdlib-0.6.0.ebuild 429 RMD160 86f7d8fd917c69a8f4c1e4da52a29acc4654037f SHA1 30001dc79c5694efecd9a333f9a0ad571aebc233 SHA256 e07e92fdd8f3f60043bd8213ff05a956390c4bddcb04066a2c7aa6800f4a6675 |
314 | +MISC ChangeLog 286 RMD160 77732d155c1e15d35c6b4ccbf0439d26aed265c2 SHA1 c203ac31c45fd38c205ee61ef565e75d1f75dd9d SHA256 5f2105039ee4a8956e73f0497d80a1f38839827bfa2df96bed2b77bb5f7546b9 |
315 | MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4 |
316 | |
317 | === renamed file 'dev-python/pyftpdlib/pyftpdlib-0.5.2.ebuild' => 'dev-python/pyftpdlib/pyftpdlib-0.6.0.ebuild' |
318 | --- dev-python/pyftpdlib/pyftpdlib-0.5.2.ebuild 2010-12-20 18:30:27 +0000 |
319 | +++ dev-python/pyftpdlib/pyftpdlib-0.6.0.ebuild 2011-02-12 15:51:31 +0000 |
320 | @@ -1,4 +1,4 @@ |
321 | -# Copyright 1999-2010 Gentoo Foundation |
322 | +# Copyright 1999-2011 Gentoo Foundation |
323 | # Distributed under the terms of the GNU General Public License v2 |
324 | # $Header: $ |
325 | |
326 | |
327 | === added directory 'dev-vcs/bzr-explorer' |
328 | === added file 'dev-vcs/bzr-explorer/Manifest' |
329 | --- dev-vcs/bzr-explorer/Manifest 1970-01-01 00:00:00 +0000 |
330 | +++ dev-vcs/bzr-explorer/Manifest 2011-02-12 15:51:31 +0000 |
331 | @@ -0,0 +1,3 @@ |
332 | +DIST bzr-explorer-1.1.2.tar.gz 1409086 RMD160 e48d87804cf4ffd1bcb32127f27ec9c41125d236 SHA1 521dfbeaad645e4916aa9eb1e8f27c4633080433 SHA256 fa0ee86f6bba4240761858e46a908567f4f20ed35c8e853e95dc465da0cc8efc |
333 | +EBUILD bzr-explorer-1.1.2.ebuild 772 RMD160 9613b4162ffe9bf24caf990882b92a8cd8e1ee89 SHA1 a4f276348ccbf89ce083155a3dbb1aa24df5fe97 SHA256 d29a61d6482a8136628d0d822b321a7b115d7171ae0c680080b0c167df646e9c |
334 | +MISC metadata.xml 548 RMD160 6584f99391e5ab9732c71da280f7c72cc6fe8b09 SHA1 c7660cf3322bb1fb62bc96280e711bff2305b084 SHA256 9999d2e2ae17e6f69b0494acf7c6724607ca8bdbd060d8f3f8d87822769df48c |
335 | |
336 | === added file 'dev-vcs/bzr-explorer/bzr-explorer-1.1.2.ebuild' |
337 | --- dev-vcs/bzr-explorer/bzr-explorer-1.1.2.ebuild 1970-01-01 00:00:00 +0000 |
338 | +++ dev-vcs/bzr-explorer/bzr-explorer-1.1.2.ebuild 2011-02-12 15:51:31 +0000 |
339 | @@ -0,0 +1,31 @@ |
340 | +# Copyright 1999-2011 Gentoo Foundation |
341 | +# Distributed under the terms of the GNU General Public License v2 |
342 | +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/bzr-explorer-1.1.1.ebuild,v 1.3 2011/01/22 16:30:09 phajdan.jr Exp $ |
343 | + |
344 | +EAPI="3" |
345 | +PYTHON_DEPEND="2" |
346 | +SUPPORT_PYTHON_ABIS="1" |
347 | +RESTRICT_PYTHON_ABIS="3.*" |
348 | + |
349 | +inherit distutils |
350 | + |
351 | +MY_PV=${PV/_beta/b} |
352 | +MY_PV=${MY_PV/_rc/rc} |
353 | +LPV=${MY_PV} |
354 | +MY_P=${PN}-${MY_PV} |
355 | + |
356 | +DESCRIPTION="A high level interface to all commonly used Bazaar features" |
357 | +HOMEPAGE="https://launchpad.net/bzr-explorer" |
358 | +SRC_URI="http://launchpad.net/${PN}/1.1/${LPV}/+download/${MY_P}.tar.gz" |
359 | +LICENSE="GPL-2" |
360 | + |
361 | +SLOT="0" |
362 | +KEYWORDS="~amd64 ~x86" |
363 | +IUSE="gtk" |
364 | + |
365 | +DEPEND="" |
366 | +RDEPEND=">=dev-vcs/bzr-1.14 |
367 | + >=dev-vcs/qbzr-0.19 |
368 | + gtk? ( dev-vcs/bzr-gtk )" |
369 | + |
370 | +S="${WORKDIR}"/explorer |
371 | |
372 | === added file 'dev-vcs/bzr-explorer/metadata.xml' |
373 | --- dev-vcs/bzr-explorer/metadata.xml 1970-01-01 00:00:00 +0000 |
374 | +++ dev-vcs/bzr-explorer/metadata.xml 2011-02-12 15:51:31 +0000 |
375 | @@ -0,0 +1,12 @@ |
376 | +<?xml version="1.0" encoding="UTF-8"?> |
377 | +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
378 | +<pkgmetadata> |
379 | + <herd>bazaar</herd> |
380 | + <longdescription lang="en"> |
381 | + Bazaar Explorer is a desktop application for using the Bazaar |
382 | + Version Control System. It provides a high level interface to all |
383 | + commonly used features, launching "applets" from the QBzr plug-in |
384 | + to provide most of the functionality. Alternatively, the applets |
385 | + from the bzr-gtk plug-in can be used if it is installed. |
386 | + </longdescription> |
387 | +</pkgmetadata> |
388 | |
389 | === modified file 'dev-vcs/bzr-git/Manifest' |
390 | --- dev-vcs/bzr-git/Manifest 2010-11-27 11:11:12 +0000 |
391 | +++ dev-vcs/bzr-git/Manifest 2011-02-12 15:51:31 +0000 |
392 | @@ -1,2 +1,4 @@ |
393 | +DIST bzr-git-0.5.4.tar.gz 87423 RMD160 f218da2eaee09123d619a41c76d71f073e760e67 SHA1 679d839653e7c8c64d063137a833342219ee767c SHA256 976db9b5eb7f9141fe78309d8fa24d2041cad0bfcf1ed2ed5ad24ee183848048 |
394 | +EBUILD bzr-git-0.5.4.ebuild 939 RMD160 841f4e4a6f09623131ac0b368a15d6abb677d066 SHA1 c3ad5f26c509a421cd71bff41674fed2885c6af0 SHA256 72f82ccdcfb6ca25fa2b1ea2b2c0d7abac2791c18ec732650bec0eb90ca7527b |
395 | EBUILD bzr-git-9999.ebuild 611 RMD160 f45bce7ceb0b3237c279d7db2958da233c05c999 SHA1 3682c166c2a0ef5e012d81182c529d4554c1f356 SHA256 26cf5d4fcbbd60bec2bfd930883979ca04ab92793aae3333501558b10d22e663 |
396 | MISC metadata.xml 285 RMD160 a8952a49acb5b00e48df37554397820e313c99b9 SHA1 4fcb8a3ef1ef0a98a45e198fde764ea292e08ee8 SHA256 b44ef9ceebc8a707893640732ebd31680a99fbaab6cbbe3d9bf99f4c5486e0d4 |
397 | |
398 | === added file 'dev-vcs/bzr-git/bzr-git-0.5.4.ebuild' |
399 | --- dev-vcs/bzr-git/bzr-git-0.5.4.ebuild 1970-01-01 00:00:00 +0000 |
400 | +++ dev-vcs/bzr-git/bzr-git-0.5.4.ebuild 2011-02-12 15:51:31 +0000 |
401 | @@ -0,0 +1,37 @@ |
402 | +# Copyright 1999-2011 Gentoo Foundation |
403 | +# Distributed under the terms of the GNU General Public License v2 |
404 | +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-git/bzr-git-0.5.2.ebuild,v 1.3 2011/01/22 16:28:08 phajdan.jr Exp $ |
405 | + |
406 | +EAPI="3" |
407 | +PYTHON_DEPEND="2" |
408 | +SUPPORT_PYTHON_ABIS="1" |
409 | +RESTRICT_PYTHON_ABIS="3.*" |
410 | + |
411 | +inherit distutils |
412 | + |
413 | +DESCRIPTION="Support for Git branches in Bazaar" |
414 | +HOMEPAGE="http://bazaar-vcs.org/BzrForeignBranches/Git" |
415 | +SRC_URI="" |
416 | + |
417 | +LICENSE="GPL-2" |
418 | +SLOT="0" |
419 | + |
420 | +if [[ ${PV} = 9999 ]]; then |
421 | + inherit bzr |
422 | + EBZR_REPO_URI="lp:bzr-git" |
423 | + KEYWORDS="" |
424 | +else |
425 | + SRC_URI="http://samba.org/~jelmer/bzr/${P}.tar.gz" |
426 | + KEYWORDS="~amd64 ~x86" |
427 | +fi |
428 | + |
429 | +IUSE="" |
430 | +# Test are broken, they want API functions from Dulwich which are not |
431 | +# installed in Gentoo |
432 | +RESTRICT="test" |
433 | + |
434 | +# Check info.py for dulwich and bzr version dependency info. |
435 | +# The file should be fairly straightforward to understand. |
436 | +DEPEND="" |
437 | +RDEPEND=">=dev-python/dulwich-0.5.0 |
438 | + >=dev-vcs/bzr-1.15_rc1" |
439 | |
440 | === modified file 'www-apps/loggerhead/Manifest' |
441 | --- www-apps/loggerhead/Manifest 2010-12-20 18:33:32 +0000 |
442 | +++ www-apps/loggerhead/Manifest 2011-02-12 15:51:31 +0000 |
443 | @@ -1,5 +1,5 @@ |
444 | AUX loggerhead.confd 70 RMD160 c296a0e5db2ad2e59a9fd0b02e66fbd48a6fa4cc SHA1 be2e6c10f0930620aec3db49bae97a9e26f6268f SHA256 c6bba819e39df844cf7e36bdca19fef8732cce4b01ef7f38cc48365898238596 |
445 | AUX loggerhead.init 556 RMD160 4c1ac57d17702c2484a40bdd978ef0afbcb2af72 SHA1 41f599dd7f13232a8205c17a76abef299bacb559 SHA256 93d9c40ca49370db748d56afffafd6b0a8531a751ff6a4e8df6ab9d3e75f9818 |
446 | -DIST loggerhead-1.17.tar.gz 706897 RMD160 847e3c12eff66e9fdf617e0ef7523f7f74e3c82c SHA1 910b5f569c8647294cabfa45698909b1fffda1ee SHA256 84af906b54407b1be01e016c4447b52cc48e714c5b9f21cf091f5cdbbe65fb97 |
447 | -EBUILD loggerhead-1.17-r2.ebuild 786 RMD160 bebf9e86981dbf7160d5a9be4d6336b3255a07f4 SHA1 a2681442fb7f84a361107697d74dc05ae917b6ad SHA256 40d3642d09baee4a28821702e04ee9b936392a74fd1c88da3e950155dc7e4a6f |
448 | +DIST loggerhead-1.18.tar.gz 694822 RMD160 2883ad797da7d6db36449fc299eafd9d3c4af8a8 SHA1 46a379ca0cbdd32b67448acc9f31c4d4cfea7ea8 SHA256 be7a3d0e62e7e24c14949755306419288d5fe2de3a1047a14ecbe15bb5345796 |
449 | +EBUILD loggerhead-1.18.ebuild 785 RMD160 30c43c8d7909cfa8c2bb950a125c3200db7d0841 SHA1 80749659b33dbc4c7384bfbb697ce2831588ef29 SHA256 1b31045501b96902238e1f0b6010bc37108704c1f77410afc862d9a832d1e12a |
450 | MISC metadata.xml 380 RMD160 d2836fb3518f6028fe7b94c4fbfe0f953940c162 SHA1 cf0c3edc469fa0a8dc65828ff10de7d99819a177 SHA256 ff299b6067b90a8bf61aff7f5e74854926a8b9a85f3044c0e8da4579a66355a2 |
451 | |
452 | === renamed file 'www-apps/loggerhead/loggerhead-1.17-r2.ebuild' => 'www-apps/loggerhead/loggerhead-1.18.ebuild' |
453 | --- www-apps/loggerhead/loggerhead-1.17-r2.ebuild 2010-12-20 18:33:32 +0000 |
454 | +++ www-apps/loggerhead/loggerhead-1.18.ebuild 2011-02-12 15:51:31 +0000 |
455 | @@ -1,4 +1,4 @@ |
456 | -# Copyright 1999-2010 Gentoo Foundation |
457 | +# Copyright 1999-2011 Gentoo Foundation |
458 | # Distributed under the terms of the GNU General Public License v2 |
459 | # $Header: $ |
460 | |
461 | @@ -23,7 +23,7 @@ |
462 | dev-python/simplejson |
463 | search? ( dev-vcs/bzr-search )" |
464 | |
465 | -S="${WORKDIR}"/${PN} |
466 | +S="${WORKDIR}"/${P} |
467 | |
468 | src_install() { |
469 | distutils_src_install |
470 | |
471 | === modified file 'www-apps/trac-bzr/Manifest' |
472 | --- www-apps/trac-bzr/Manifest 2010-12-20 18:29:18 +0000 |
473 | +++ www-apps/trac-bzr/Manifest 2011-02-12 15:51:31 +0000 |
474 | @@ -1,3 +1,3 @@ |
475 | -DIST TracBzr-0.4.1.tar.gz 26934 RMD160 21d305b21f4d60acb181a996abb52b9d242b648d SHA1 2c3230b39bb184c10f1ecb3cac7e5b9bd9b6d9a3 SHA256 cf9ed1883182e1d8848a9a38d8f17c358b8b21961afeda434c7632b759950993 |
476 | -EBUILD trac-bzr-0.4.1.ebuild 451 RMD160 d39d420f694061c89cd69a8d63901d09c74c5e75 SHA1 4639c851e2ba133034957f16e67e50f4a6fbd5a9 SHA256 28ee71d3f302a90e9ddad15edac61f536398056277778fe162f596de6fc4c01c |
477 | +DIST TracBzr-0.4.2.tar.gz 33614 RMD160 d4f1cc1f286cd437431eee3989eae41205063a93 SHA1 907f9ce09095a7ff561ccc479b5714213510b5b4 SHA256 dfcfb4ea46d97933f520a7b1bcd0416f42be32a5d86f2da47ab446ca10f951fe |
478 | +EBUILD trac-bzr-0.4.2.ebuild 451 RMD160 c18ff820d76711232842980683f12947b8ee7f9e SHA1 6bd5cc209c339193c459dd53001d912cd8f5ba25 SHA256 8ddc1924dae8846ea7ddf3083c1b1496a0fa6aff2f73b11a81b6895494a6a9e8 |
479 | MISC metadata.xml 302 RMD160 f7f00ac86e9287aed9e2ab7b93ac533420cfa707 SHA1 0723594916425f1503729b08624fa026ddfcd517 SHA256 3e2c82529f40a2abc2e403e16c76a066f60fe9e74d46eb2e3d0c403f2f960943 |
480 | |
481 | === renamed file 'www-apps/trac-bzr/trac-bzr-0.4.1.ebuild' => 'www-apps/trac-bzr/trac-bzr-0.4.2.ebuild' |
482 | --- www-apps/trac-bzr/trac-bzr-0.4.1.ebuild 2010-12-20 18:29:18 +0000 |
483 | +++ www-apps/trac-bzr/trac-bzr-0.4.2.ebuild 2011-02-12 15:51:31 +0000 |
484 | @@ -1,4 +1,4 @@ |
485 | -# Copyright 1999-2010 Gentoo Foundation |
486 | +# Copyright 1999-2011 Gentoo Foundation |
487 | # Distributed under the terms of the GNU General Public License v2 |
488 | # $Header: $ |
489 |
Is fine, but I bumped bzr-explorer and bzr-git in the official tree. Please remove the bumps from your tree and I will merge it.