revision bump for runtime regression with bzr help commands, as reported by Dan Dexter in bug 418969

Package-Manager: portage-2.1.11.31/cvs/Linux i686
Manifest-Sign-Key: 0x2B859DE3

4 files changed, 262 insertions, 5 deletions

diff --git a/dev-vcs/bzr-xmloutput/ChangeLog b/dev-vcs/bzr-xmloutput/ChangeLog
index f55d9744f129..542320060026 100644
--- a/dev-vcs/bzr-xmloutput/ChangeLog
+++ b/dev-vcs/bzr-xmloutput/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/bzr-xmloutput
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-xmloutput/ChangeLog,v 1.14 2012/11/28 19:26:31 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-xmloutput/ChangeLog,v 1.15 2012/11/28 19:39:00 fauli Exp $
+
+*bzr-xmloutput-0.8.8-r1 (28 Nov 2012)
+
+  28 Nov 2012; Christian Faulhammer <fauli@gentoo.org>
+  +bzr-xmloutput-0.8.8-r1.ebuild,
+  +files/bzr-xmloutput-0.8.8_remove-relative-imports.patch:
+  revision bump for runtime regression with bzr help commands, as reported by
+  Dan Dexter in bug 418969
 
   28 Nov 2012; Christian Faulhammer <fauli@gentoo.org>
   -bzr-xmloutput-0.8.7.ebuild:
diff --git a/dev-vcs/bzr-xmloutput/Manifest b/dev-vcs/bzr-xmloutput/Manifest
index cb2693fdde6a..90e724a365e0 100644
--- a/dev-vcs/bzr-xmloutput/Manifest
+++ b/dev-vcs/bzr-xmloutput/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bzr-xmloutput-0.8.8_remove-relative-imports.patch 5175 SHA256 96c8187bd4bd266a808763ff0232c3bdada7169e434f7f023b90bcf38f9b8b29 SHA512 209b3e4df0123a85a34d9b1f3cb2706fe61ab3bf779011cb16cabcc92245204c06d5be6ab16def6389fadb882b8ff8da5b0551baba988354ef95a777fff355b7 WHIRLPOOL d744faa1593f138d101a2e566ffe073df2a8b7da7fc97ebc6dbc6da589c08ced875074beb3bfd9b3642a5543364dfe3efa3f1179fe1a1f6dc4c9bca4a3af4e02
 DIST bzr-xmloutput-0.8.8.tar.gz 49969 SHA256 73b9b2f6ce4d9910031df7fd153d56d14f833c20a106f099bee5a33463f73b36 SHA512 9eb87ba86dd45b7132eca69ef6e52726d7ee2d9211cc3052655e40f5cee2b99e160336c347ddce7ad912c0027e8b6a05ca542f70733d2e3493922cfa311b38ef WHIRLPOOL e07a08cd0738524207e7ab8d6c645b86d087391fb06d1e0ecf08cfbe78e6f6a1e730af41f4e2dea9e197e7c7f0de69cf6494ab1f906919febb86e06b490fe4e2
+EBUILD bzr-xmloutput-0.8.8-r1.ebuild 716 SHA256 ab9bc90f526f74414ff22261a16e2d81d26374b587742147f5c9bbdf166870f7 SHA512 364ae3c011f457d9a0f26a5e507d927d655340e728de54bdb8a1b9831cc190b930e2369dd19c11a5322e137a96d651d78f96d0ad3b6187ea58a62bf15a8508e3 WHIRLPOOL 27a9d53bce187ce74409bbbc834f9ec4359ab14e6051425d536d358e9c6c87fd1e6e829539a3d58fab33294e05c169f44f52cd8fe2113dcf55c323d97d0f2e28
 EBUILD bzr-xmloutput-0.8.8.ebuild 630 SHA256 359df2bc07f65a238528c3646e58fd86d98cdbb726dc9ddcdb3e5c727727b08a SHA512 56a66457358d3d8d6e2665fb3d7615d44d64cbcc3e8561d35f6c379a35188f6cde1ef4b0874f214c3c739aff65f64f3b324b23a60f7db6c4f6c52949ca583c9f WHIRLPOOL 4d62fd92f822357e1a8ed6d65c2ee15fee2bd1e130b83496bad5fbf4480739b64bbdbc917ded84bdf70bdbdb513aeddd7a1bad34b300b1b08e895ccebbff3395
-MISC ChangeLog 1981 SHA256 4fa3673886421dd807be19aa462548375c2b8a6cb7193aed77b7f319aca14c3b SHA512 65bc6c8880ba4ed1e7726826d40773ef958f87a8852e8cb9677afdb29b1bd30083c4041e3743997b52749c5f43760fdfa5196b515b0422dc2e5db5bb3d6f10d1 WHIRLPOOL f47c53de6147cb731be2ebc5cec498aa04dbde8172b8b98b56f1529d4ba915e6554da19f8ceaed2b336c3ff2c92f1d36d158cee58899121cc8739b0d36841c25
+MISC ChangeLog 2275 SHA256 8206739e9f53dd513c1d851502a8bd2e1919a2db644944b0fea8e3a635b4b9d3 SHA512 86a8124b9bca0d74f1d0500ebffeaba3b57e7944237f516e4e52d776f295880e7f82d9ad06b04b3826c1b6c6a7708db119e51cddca089899661ed8e15c201af6 WHIRLPOOL 636eaea48ccc671d00b606ca68a2a83d58a28a647413b0a582b33877056ada248b6ab726ab1e8c13d06260a03b1d630527bdd0ec5d15d1059183cefcad6e5838
 MISC metadata.xml 161 SHA256 10876eb627faa0f7204c3bca5931c5579842b655590d4a4205d095f6137074ec SHA512 8a036f43ea235edd491c209e25d64ed620bc9d7f6c0de4b155f3d73c1c4fd036d9c5f5eb26e3aa7999592903ad3aa107d650cc1cfb9b4b096149561bf0d13fed WHIRLPOOL 2a528814b399514084b09bd1663e0c30c05b1861eb42411a70a492e6f2ee24915653e1322c2c33e668e8475babf54409abf95c471f18779bea6179da7de6c9c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC2ZXYACgkQNQqtfCuFneM5CgCfbdh5dmadFxocxfyGJ7S+hhfw
-7FMAn2tiJL6OzguN5GbtrUPm0lxLtaiS
-=fk+P
+iEYEAREIAAYFAlC2aFoACgkQNQqtfCuFneMi+ACfZTheqQkJ569ttCEuRGSPDnT0
+Y6QAn3RuqdJhY3HZIOCXb4LQZFosKbdN
+=eiaO
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r1.ebuild b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r1.ebuild
new file mode 100644
index 000000000000..1b0a41d825d3
--- /dev/null
+++ b/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-xmloutput/bzr-xmloutput-0.8.8-r1.ebuild,v 1.1 2012/11/28 19:39:00 fauli Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit distutils eutils
+
+DESCRIPTION="A Bazaar plugin that provides a option to generate XML output for
+builtin commands."
+HOMEPAGE="http://bazaar-vcs.org/XMLOutput"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-vcs/bzr"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}_remove-relative-imports.patch
+}
diff --git a/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch b/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch
new file mode 100644
index 000000000000..b21eef05d2ad
--- /dev/null
+++ b/dev-vcs/bzr-xmloutput/files/bzr-xmloutput-0.8.8_remove-relative-imports.patch
@@ -0,0 +1,220 @@
+revno: 160 [merge]
+author: Jelmer Vernooij <jelmer@samba.org>
+committer: Guillermo Gonzalez <guillo.gonzo@gmail.com>
+branch nick: trunk
+timestamp: Mon 2011-12-19 18:45:35 -0300
+message:
+  Removes the use of relative imports and avoids using lazy_import in a few places we're it doesn't make a difference.
+
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=418969
+Upstream bug: https://bugs.launchpad.net/bzr-xmloutput/+bug/955329
+Commit: http://bazaar.launchpad.net/~verterok/bzr-xmloutput/trunk/revision/160
+
+--- cmds.py	2011-03-09 23:19:41 +0000
++++ cmds.py	2011-12-12 15:11:38 +0000
+@@ -22,36 +22,39 @@
+ 
+ import info
+ import bzrlib
++from bzrlib.option import Option
++from bzrlib.commands import (
++    Command,
++    display_command,
++    )
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import sys
+ from bzrlib import (
+     builtins,
+     bzrdir,
+-    commands,
+-    option,
+     log,
+     workingtree,
+     errors
+     )
+ 
+-from bzrlib.option import Option, custom_help
+-from bzrlib.commands import display_command
+-import logxml
+-import service
++from bzrlib.plugins.xmloutput import (
++    logxml,
++    service,
++    )
+ import socket
+-from xml_errors import handle_error_xml
+ """)
+ 
++from bzrlib.plugins.xmloutput.xml_errors import handle_error_xml
+ 
+ version_info = info.bzr_plugin_version
+ plugin_name = info.bzr_plugin_name
+ 
+-null_option = option.Option('null',
+-                            help='Write an ascii NUL (\\0) as the final char.')
+-
+-
+-class cmd_xmlstatus(commands.Command):
++null_option = Option('null',
++                     help='Write an ascii NUL (\\0) as the final char.')
++
++
++class cmd_xmlstatus(Command):
+     """Display status summary.
+ 
+     This reports on versioned and unknown files, reporting them
+@@ -118,7 +121,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlannotate(commands.Command):
++class cmd_xmlannotate(Command):
+     """Show the origin of each line in a file.
+ 
+     This prints out the given file with an annotation on the left side
+@@ -176,7 +179,7 @@
+                 branch.unlock()
+ 
+ 
+-class cmd_xmlmissing(commands.Command):
++class cmd_xmlmissing(Command):
+     """Show unmerged/unpulled revisions between two branches.
+ 
+     OTHER_BRANCH may be local or remote.
+@@ -212,7 +215,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlinfo(commands.Command):
++class cmd_xmlinfo(Command):
+     """Show information about a working tree, branch or repository.
+ 
+     This command will show all known locations and formats associated to the
+@@ -247,7 +250,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlplugins(commands.Command):
++class cmd_xmlplugins(Command):
+     """List the installed plugins.
+ 
+     This command displays the list of installed plugins including
+@@ -284,7 +287,7 @@
+         self.outf.write('\n')
+ 
+ 
+-class cmd_xmlversion(commands.Command):
++class cmd_xmlversion(Command):
+     """Show version of bzr."""
+     hidden = True
+     encoding_type = 'replace'
+@@ -383,7 +386,7 @@
+             self.outf.write('\0')
+         self.outf.write('\n')
+ 
+-class cmd_start_xmlrpc(commands.Command):
++class cmd_start_xmlrpc(Command):
+     """Start the xmlrpc service."""
+ 
+     hidden = True
+@@ -413,7 +416,7 @@
+             self.server.shutdown()
+ 
+ 
+-class cmd_stop_xmlrpc(commands.Command):
++class cmd_stop_xmlrpc(Command):
+     """Stops a xmlrpc service."""
+ 
+     hidden = True
+
+--- infoxml.py	2009-07-28 03:43:56 +0000
++++ infoxml.py	2011-12-12 15:11:38 +0000
+@@ -27,6 +27,7 @@
+ 
+ __all__ = ['show_bzrdir_info_xml']
+ 
++from bzrlib import info
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import os, sys, time
+@@ -36,7 +37,6 @@
+     errors,
+     osutils,
+     urlutils,
+-    info,
+     missing,
+     )
+ """)
+
+--- logxml.py	2010-12-15 18:27:12 +0000
++++ logxml.py	2011-12-12 15:11:38 +0000
+@@ -1,14 +1,12 @@
+ # -*- encoding: utf-8 -*-
+ 
+-import os
+-
++from bzrlib import log
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import bzrlib
+ from bzrlib import (
+     debug,
+     osutils,
+-    log,
+     )
+ """)
+ 
+
+--- lsxml.py	2011-03-09 23:41:22 +0000
++++ lsxml.py	2011-12-12 15:11:38 +0000
+@@ -19,8 +19,6 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ #
+ 
+-import os
+-
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ from bzrlib import bzrdir, errors, osutils
+
+--- service.py	2010-02-23 23:38:02 +0000
++++ service.py	2011-12-12 15:11:38 +0000
+@@ -20,6 +20,8 @@
+ #
+ """ xmlrpc service module """
+ 
++import os
++
+ from bzrlib.lazy_import import lazy_import
+ lazy_import(globals(), """
+ import bzrlib
+@@ -30,14 +32,13 @@
+     osutils
+     )
+ import sys
+-import os
+ import codecs
+ import logging
+ import traceback
+ from cStringIO import StringIO
+ """)
+ 
+-from xml_errors import XMLError
++from bzrlib.plugins.xmloutput.xml_errors import XMLError
+ from xmlrpclib import Fault, Binary
+ from SimpleXMLRPCServer import SimpleXMLRPCServer
+ 
+
+--- statusxml.py	2010-12-15 18:27:12 +0000
++++ statusxml.py	2011-12-12 15:11:38 +0000
+@@ -33,7 +33,7 @@
+     trace,
+     )
+ 
+-import logxml
++from bzrlib.plugins.xmloutput import logxml
+ """)
+ 
+ from writer import _escape_cdata
+