Moved over from dev-util category

11 files changed, 1159 insertions, 0 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
new file mode 100644
index 000000000000..85dfe8cd04c1
--- /dev/null
+++ b/dev-vcs/bzr/ChangeLog
@@ -0,0 +1,635 @@
+# ChangeLog for dev-util/bzr
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.1 2010/03/05 09:33:53 fauli Exp $
+
+  03 Mar 2010; Christian Faulhammer <fauli@gentoo.org> bzr-2.1.0.ebuild:
+  fix SRC_URI, thanks to Locke Shinseiko <Wizzleby AT gmail DOT com> in bug
+  307539
+
+  03 Mar 2010; Christian Faulhammer <fauli@gentoo.org> -bzr-2.0.3.ebuild:
+  clean up
+
+*bzr-2.1.0 (02 Mar 2010)
+
+  02 Mar 2010; Christian Faulhammer <fauli@gentoo.org>
+  -bzr-2.1.0_beta4.ebuild, +bzr-2.1.0.ebuild:
+  version bump, bug 304877
+
+  23 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
+  bzr-2.1.0_beta4.ebuild:
+  use src_prepare phase
+
+  23 Feb 2010; Christian Faulhammer <fauli@gentoo.org> bzr-2.0.4.ebuild,
+  bzr-2.1.0_beta4.ebuild:
+  Transfer changes from Prefix tree, use PYTHON_DEPEND variable
+
+  13 Feb 2010; Raúl Porcel <armin76@gentoo.org> bzr-2.0.1.ebuild,
+  bzr-2.0.3.ebuild, bzr-2.0.4.ebuild, bzr-2.1.0_beta4.ebuild:
+  Add ~s390/~sh
+
+  27 Jan 2010; Raúl Porcel <armin76@gentoo.org> bzr-2.0.1.ebuild,
+  bzr-2.0.3.ebuild, bzr-2.0.4.ebuild, bzr-2.1.0_beta4.ebuild:
+  Add ~alpha/~arm wrt #300750
+
+  24 Jan 2010; Tom Gall <tgall@gentoo.org> bzr-2.0.1.ebuild:
+  stable on ppc64
+
+*bzr-2.0.4 (23 Jan 2010)
+
+  23 Jan 2010; Christian Faulhammer <fauli@gentoo.org> +bzr-2.0.4.ebuild:
+  version bump
+
+*bzr-2.1.0_beta4 (10 Jan 2010)
+
+  10 Jan 2010; Peter Volkov <pva@gentoo.org> -bzr-2.1.0_beta1.ebuild,
+  +bzr-2.1.0_beta4.ebuild, +files/bzr-2.1-no-pyrex-citon.patch:
+  Version bump, bug #300350, thank Jeroen Roovers for report. Added missed
+  patch, bug #297268, thank Christian Faulhammer for report.
+
+  10 Jan 2010; Jeroen Roovers <jer@gentoo.org> bzr-2.0.1.ebuild:
+  Stable for HPPA too.
+
+  27 Dec 2009; Christian Faulhammer <fauli@gentoo.org> -bzr-1.15.1.ebuild,
+  -bzr-1.18.ebuild, -bzr-2.0.0.ebuild, bzr-2.1.0_beta1.ebuild:
+  clean up and silently propagate ppc64 keyword
+
+*bzr-2.0.3 (27 Dec 2009)
+
+  27 Dec 2009; Christian Faulhammer <fauli@gentoo.org> +bzr-2.0.3.ebuild:
+  version bump
+
+  27 Dec 2009; Raúl Porcel <armin76@gentoo.org> bzr-2.0.1.ebuild:
+  sparc stable wrt #294803
+
+  01 Dec 2009; Markus Meier <maekke@gentoo.org> bzr-2.0.1.ebuild:
+  amd64 stable, bug #294803
+
+  30 Nov 2009; Joseph Jezak <josejx@gentoo.org> bzr-2.0.1.ebuild:
+  Marked ppc stable for bug #294803, and marked ~ppc64.
+
+  27 Nov 2009; Christian Faulhammer <fauli@gentoo.org> bzr-2.0.1.ebuild:
+  stable x86, bug 294803
+
+*bzr-2.1.0_beta1 (20 Oct 2009)
+
+  20 Oct 2009; Peter Volkov <pva@gentoo.org> +bzr-2.1.0_beta1.ebuild:
+  Bump development version.
+
+*bzr-2.0.1 (20 Oct 2009)
+
+  20 Oct 2009; Peter Volkov <pva@gentoo.org> +bzr-2.0.1.ebuild,
+  metadata.xml:
+  Version bump. Merged in bazaard herd.
+
+  06 Oct 2009; Peter Volkov <pva@gentoo.org> bzr-2.0.0.ebuild:
+  Updated tests: some were fixed, some new fail.
+
+  29 Sep 2009; Jeroen Roovers <jer@gentoo.org> bzr-1.15.1.ebuild,
+  bzr-1.18.ebuild, bzr-2.0.0.ebuild:
+  Marked ~hppa too.
+
+*bzr-2.0.0 (23 Sep 2009)
+
+  23 Sep 2009; Christian Faulhammer <fauli@gentoo.org> -bzr-2.0_rc1.ebuild,
+  +bzr-2.0.0.ebuild:
+  version bump
+
+*bzr-2.0_rc1 (27 Aug 2009)
+
+  27 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +bzr-2.0_rc1.ebuild:
+  bump to release candidate
+
+  27 Aug 2009; Christian Faulhammer <fauli@gentoo.org> -bzr-1.16.1.ebuild,
+  -bzr-1.17.ebuild:
+  clean up
+
+*bzr-1.18 (27 Aug 2009)
+
+  27 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +bzr-1.18.ebuild:
+  version bump
+
+*bzr-1.17 (18 Aug 2009)
+
+  18 Aug 2009; Christian Faulhammer <fauli@gentoo.org> +bzr-1.17.ebuild:
+  add Bazaar 1.17 although it fails some tests. It is not intended for
+  stabilisation anyway
+
+  20 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
+  -files/bzr-0.92-no-pyrex.patch, -bzr-1.9.ebuild, -bzr-1.10.ebuild,
+  -bzr-1.11.ebuild, -bzr-1.12.ebuild, -bzr-1.13.2.ebuild,
+  -bzr-1.14.1.ebuild:
+  clean up
+
+  17 Jul 2009; nixnut <nixnut@gentoo.org> bzr-1.15.1.ebuild:
+  ppc stable #274451
+
+  10 Jul 2009; Peter Volkov <pva@gentoo.org> bzr-1.16.1.ebuild:
+  Mask more tests, update info on old failures.
+
+  05 Jul 2009; Markus Meier <maekke@gentoo.org> bzr-1.15.1.ebuild:
+  amd64 stable, bug #274451
+
+*bzr-1.16.1 (02 Jul 2009)
+
+  02 Jul 2009; Christian Faulhammer <fauli@gentoo.org> -bzr-1.16_rc1.ebuild,
+  +bzr-1.16.1.ebuild:
+  version bump and clean up
+
+  02 Jul 2009; Raúl Porcel <armin76@gentoo.org> bzr-1.15.1.ebuild:
+  sparc stable wrt #274451
+
+  17 Jun 2009; Christian Faulhammer <fauli@gentoo.org> bzr-1.15.1.ebuild:
+  stable x86, bug 274451
+
+*bzr-1.16_rc1 (17 Jun 2009)
+
+  17 Jun 2009; Peter Volkov <pva@gentoo.org> +bzr-1.16_rc1.ebuild:
+  Version bump.
+
+*bzr-1.15.1 (10 Jun 2009)
+
+  10 Jun 2009; Peter Volkov <pva@gentoo.org> -bzr-1.15.ebuild,
+  +bzr-1.15.1.ebuild:
+  Version bump, missed pyrex generated C files now back, bug #273328, thank
+  Andrew Cowie and Mark Lee.
+
+*bzr-1.15 (05 Jun 2009)
+
+  05 Jun 2009; Peter Volkov <pva@gentoo.org> +bzr-1.15.ebuild:
+  Version bump.
+
+  01 Jun 2009; Markus Meier <maekke@gentoo.org> bzr-1.13.2.ebuild:
+  amd64 stable, bug #271130
+
+  25 May 2009; Christian Faulhammer <fauli@gentoo.org> bzr-1.13.2.ebuild:
+  stable x86, bug 271130
+
+*bzr-1.14.1 (02 May 2009)
+
+  02 May 2009; Peter Volkov <pva@gentoo.org> -bzr-1.14.ebuild,
+  +bzr-1.14.1.ebuild:
+  Version bump.
+
+*bzr-1.14 (01 May 2009)
+*bzr-1.13.2 (01 May 2009)
+
+  01 May 2009; Peter Volkov <pva@gentoo.org> -bzr-1.13.1.ebuild,
+  +bzr-1.13.2.ebuild, -bzr-1.14_rc2.ebuild, +bzr-1.14.ebuild:
+  Version bump.
+
+*bzr-1.14_rc2 (25 Apr 2009)
+
+  25 Apr 2009; Peter Volkov <pva@gentoo.org> -bzr-1.14_rc1.ebuild,
+  +bzr-1.14_rc2.ebuild:
+  Version bump.
+
+*bzr-1.14_rc1 (11 Apr 2009)
+
+  11 Apr 2009; Peter Volkov <pva@gentoo.org> bzr-1.13.1.ebuild,
+  +bzr-1.14_rc1.ebuild:
+  Version bump.
+
+*bzr-1.13.1 (25 Mar 2009)
+
+  25 Mar 2009; Peter Volkov <pva@gentoo.org> -bzr-1.13.ebuild,
+  +bzr-1.13.1.ebuild:
+  Version bump.
+
+  22 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  metadata.xml:
+  Removing hawking as a maintainer since he was retired.
+
+*bzr-1.13 (17 Mar 2009)
+
+  17 Mar 2009; Peter Volkov <pva@gentoo.org> -bzr-1.13_rc1.ebuild,
+  +bzr-1.13.ebuild:
+  Version bump.
+
+*bzr-1.13_rc1 (15 Mar 2009)
+
+  15 Mar 2009; Peter Volkov <pva@gentoo.org> +bzr-1.13_rc1.ebuild:
+  Version bump.
+
+  20 Feb 2009; Christian Faulhammer <fauli@gentoo.org> bzr-1.12.ebuild:
+  make USE=sftp default with EAPI=1
+
+  20 Feb 2009; Christian Faulhammer <fauli@gentoo.org> bzr-1.12.ebuild:
+  make Python 2.5 first choice so people get that pulled in in every case
+
+*bzr-1.12 (14 Feb 2009)
+
+  14 Feb 2009; Christian Faulhammer <fauli@gentoo.org> -bzr-1.12_rc1.ebuild,
+  +bzr-1.12.ebuild:
+  version bump
+
+*bzr-1.12_rc1 (10 Feb 2009)
+
+  10 Feb 2009; Peter Volkov <pva@gentoo.org> +bzr-1.12_rc1.ebuild:
+  Version bump. Release candidates will be added hard masked.
+
+  08 Feb 2009; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
+  add myself as maintainer
+
+*bzr-1.11 (20 Jan 2009)
+
+  20 Jan 2009; Peter Volkov <pva@gentoo.org> -bzr-1.11_rc1.ebuild,
+  +bzr-1.11.ebuild:
+  Version bump.
+
+*bzr-1.11_rc1 (10 Jan 2009)
+
+  10 Jan 2009; Peter Volkov <pva@gentoo.org> -bzr-1.5.ebuild,
+  -bzr-1.6.1.ebuild, -bzr-1.7.1.ebuild, -bzr-1.8.ebuild, -bzr-1.8-r1.ebuild,
+  +bzr-1.11_rc1.ebuild:
+  Version bump. Remove old.
+
+  03 Jan 2009; nixnut <nixnut@gentoo.org> bzr-1.9.ebuild:
+  ppc stable #252656
+
+  31 Dec 2008; Raúl Porcel <armin76@gentoo.org> bzr-1.9.ebuild:
+  x86 stable wrt #252656
+
+  31 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> bzr-1.9.ebuild:
+  Stable on sparc, bug #252656
+
+  28 Dec 2008; Jeremy Olexa <darkside@gentoo.org> bzr-1.9.ebuild:
+  amd64 stable, bug 252656
+
+*bzr-1.10 (08 Dec 2008)
+
+  08 Dec 2008; Peter Volkov <pva@gentoo.org> -bzr-1.10_rc1.ebuild,
+  +bzr-1.10.ebuild:
+  Version bump.
+
+*bzr-1.10_rc1 (29 Nov 2008)
+
+  29 Nov 2008; Peter Volkov <pva@gentoo.org> +bzr-1.10_rc1.ebuild:
+  Version bump.
+
+*bzr-1.9 (07 Nov 2008)
+
+  07 Nov 2008; Peter Volkov <pva@gentoo.org> -bzr-1.9_rc1.ebuild,
+  +bzr-1.9.ebuild:
+  Version bump.
+
+*bzr-1.9_rc1 (01 Nov 2008)
+
+  01 Nov 2008; Peter Volkov <pva@gentoo.org> +bzr-1.9_rc1.ebuild:
+  Version bump.
+
+  26 Oct 2008; Ali Polatel <hawking@gentoo.org> bzr-1.5.ebuild,
+  bzr-1.6.1.ebuild, bzr-1.7.1.ebuild, bzr-1.8.ebuild:
+  Use python_{en,dis}able_pyc.
+
+  24 Oct 2008; Raúl Porcel <armin76@gentoo.org> bzr-1.6.1.ebuild:
+  sparc stable wrt #241740
+
+  21 Oct 2008; Ali Polatel <hawking@gentoo.org> bzr-1.8-r1.ebuild:
+  Use python_{en,dis}able_pyc.
+
+*bzr-1.8-r1 (21 Oct 2008)
+
+  21 Oct 2008; Ali Polatel <hawking@gentoo.org> +bzr-1.8-r1.ebuild:
+  Add doc use flag #243012. Add die to dodoc calls.
+
+  19 Oct 2008; Markus Meier <maekke@gentoo.org> bzr-1.6.1.ebuild:
+  amd64/x86 stable, bug #241740
+
+  18 Oct 2008; nixnut <nixnut@gentoo.org> bzr-1.6.1.ebuild:
+  Stable on ppc wrt bug 241740
+
+*bzr-1.8 (18 Oct 2008)
+
+  18 Oct 2008; Peter Volkov <pva@gentoo.org> -bzr-1.8_rc1.ebuild,
+  +bzr-1.8.ebuild:
+  Version bump.
+
+*bzr-1.8_rc1 (07 Oct 2008)
+
+  07 Oct 2008; Peter Volkov <pva@gentoo.org> +files/bzr-1.8-no-pyrex.patch,
+  +bzr-1.8_rc1.ebuild:
+  Version bump.
+
+*bzr-1.7.1 (02 Oct 2008)
+
+  02 Oct 2008; Peter Volkov <pva@gentoo.org> -bzr-1.7.ebuild,
+  +bzr-1.7.1.ebuild:
+  Version bump.
+
+*bzr-1.7 (24 Sep 2008)
+
+  24 Sep 2008; Peter Volkov <pva@gentoo.org> -bzr-1.7_rc1.ebuild,
+  +bzr-1.7.ebuild:
+  Version bump.
+
+*bzr-1.7_rc1 (15 Sep 2008)
+
+  15 Sep 2008; Peter Volkov <pva@gentoo.org> -bzr-1.6.ebuild,
+  +bzr-1.7_rc1.ebuild:
+  Version bump. Restored ChangeLog, thank alip for IRC report. Remove
+  unused.
+
+*bzr-1.6.1 (07 Sep 2008)
+
+  07 Sep 2008; Peter Volkov <pva@gentoo.org> +bzr-1.6.1.ebuild:
+  Version bump.
+
+*bzr-1.6 (25 Aug 2008)
+
+  25 Aug 2008; Peter Volkov <pva@gentoo.org> -files/70bzr-gentoo.el,
+  -files/bzr-0.16-fix-manpage-location.patch, -bzr-0.17.ebuild,
+  -bzr-1.1.ebuild, -bzr-1.3.ebuild, -bzr-1.4.ebuild, -bzr-1.6_rc5.ebuild,
+  +bzr-1.6.ebuild:
+  Version bump, removed old.
+
+  23 Aug 2008; Markus Meier <maekke@gentoo.org> bzr-1.5.ebuild:
+  amd64/x86 stable, bug #235504
+
+*bzr-1.6_rc5 (23 Aug 2008)
+
+  23 Aug 2008; Peter Volkov <pva@gentoo.org> metadata.xml,
+  +bzr-1.6_rc5.ebuild:
+  Added release candidate, hardmasked, bug #233713, thank kiorky for report.
+  Added myself to metadata.
+
+*bzr-1.5 (22 May 2008)
+
+  22 May 2008; Ali Polatel <hawking@gentoo.org> +bzr-1.5.ebuild:
+  Version bump.
+
+*bzr-1.4 (10 May 2008)
+
+  10 May 2008; Ali Polatel <hawking@gentoo.org> +bzr-1.4.ebuild:
+  Version bump.
+
+  05 May 2008; Olivier Crête <tester@gentoo.org> bzr-1.3.ebuild:
+  amd64 Stable
+
+  24 Mar 2008; Christian Faulhammer <opfer@gentoo.org> bzr-1.1.ebuild:
+  stable x86, bug 212968
+
+  23 Mar 2008; Ali Polatel <hawking@gentoo.org> bzr-1.3.ebuild:
+  Fix tests related to pyc handling.
+
+  21 Mar 2008; Ali Polatel <hawking@gentoo.org> metadata.xml:
+  Added longdescription, added myself as maintainer.
+
+*bzr-1.3 (20 Mar 2008)
+
+  20 Mar 2008; Ali Polatel <hawking@gentoo.org> +bzr-1.3.ebuild:
+  Version bump.
+
+  12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
+  Removing Marien Zwart (marienz, #107204) from metadata.xml.
+
+  15 Jan 2008; Lukasz Strzygowski <lucass@gentoo.org> -bzr-0.92-r1.ebuild,
+  -bzr-1.0.ebuild:
+  Dropped old versions.
+
+*bzr-1.1 (15 Jan 2008)
+
+  15 Jan 2008; Lukasz Strzygowski <lucass@gentoo.org> +bzr-1.1.ebuild:
+  Version bump (bug #205914).
+
+*bzr-1.0 (14 Dec 2007)
+
+  14 Dec 2007; Ali Polatel <hawking@gentoo.org> +bzr-1.0.ebuild:
+  Version bump.
+
+*bzr-0.92-r1 (14 Nov 2007)
+
+  14 Nov 2007; Ali Polatel <hawking@gentoo.org>
+  +files/bzr-0.92-no-pyrex.patch, -bzr-0.92.ebuild, +bzr-0.92-r1.ebuild:
+  revbump. don't regenerate .c files from .pyx when pyrex is found, upstream
+  ships them already.
+
+  14 Nov 2007; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/bzr-0.16-timed-tests-fix.patch, -bzr-0.16.ebuild, -bzr-0.90.ebuild,
+  -bzr-0.91.ebuild, -bzr-0.91-r1.ebuild:
+  Dropped old versions.
+
+*bzr-0.92 (14 Nov 2007)
+
+  14 Nov 2007; Lukasz Strzygowski <lucass@gentoo.org> +bzr-0.92.ebuild:
+  Version bump (bug #199112). Fixed celementtree dep, added sftp use-flag
+  (bug #196486). Cleanup.
+
+*bzr-0.91-r1 (05 Oct 2007)
+
+  05 Oct 2007; Ali Polatel <hawking@gentoo.org> +files/71bzr-gentoo.el,
+  +bzr-0.91-r1.ebuild:
+  revbump. updated emacs support, bug 194691. Thanks to Christian Faulhammer
+  <opfer@gentoo.org>
+
+*bzr-0.91 (26 Sep 2007)
+
+  26 Sep 2007; Ali Polatel <hawking@gentoo.org> +bzr-0.91.ebuild:
+  version bump.
+
+*bzr-0.90 (06 Sep 2007)
+
+  06 Sep 2007; Ali Polatel <hawking@gentoo.org>
+  +files/bzr-0.90-tests-fix_root.patch, +files/bzr-0.90-tests-sgid.patch,
+  +bzr-0.90.ebuild:
+  Version bump. Added a patch to fix tests when running w/o userpriv (bug
+  173301) and another patch to fix permission tests when running beneath a
+  directory with the setgid bit set. Pass --install-data /usr/share option to
+  distutils_src_install instead of patching for man page location.
+
+  10 Jul 2007; Markus Ullmann <jokey@gentoo.org> bzr-0.17.ebuild:
+  Stable on x86
+
+  10 Jul 2007; Markus Ullmann <jokey@gentoo.org> bzr-0.17.ebuild:
+  RESTRICT test as noted on bug #173301
+
+*bzr-0.17 (22 Jun 2007)
+
+  22 Jun 2007; Marien Zwart <marienz@gentoo.org>
+  -files/bzr-0.10-fix-manpage-location.patch, -bzr-0.15.ebuild,
+  bzr-0.16.ebuild, +bzr-0.17.ebuild:
+  Version bump and fix bug #182639 (elisp-site-regen condition in postrm).
+
+  04 Jun 2007; Marien Zwart <marienz@gentoo.org> bzr-0.15.ebuild,
+  bzr-0.16.ebuild:
+  Enhance DESCRIPTION.
+
+  11 May 2007; Marien Zwart <marienz@gentoo.org> -bzr-0.14.ebuild:
+  Remove stale version.
+
+*bzr-0.16 (11 May 2007)
+
+  11 May 2007; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.16-fix-manpage-location.patch,
+  +files/bzr-0.16-timed-tests-fix.patch, +bzr-0.16.ebuild:
+  Version bump.
+
+  02 Apr 2007; Marien Zwart <marienz@gentoo.org>
+  -files/bzr-0.8.2-paramiko-1.6-compat.patch,
+  -files/bzr-0.8.2-push-repository.patch,
+  -files/bzr-0.8-fix-manpage-location.patch,
+  -files/bzr-0.9-binary-diff.patch, -files/bzr-0.10-python-2.5-compat.patch:
+  Clean up files dir.
+
+*bzr-0.15 (02 Apr 2007)
+
+  02 Apr 2007; Marien Zwart <marienz@gentoo.org> +bzr-0.15.ebuild:
+  Version bump.
+
+  05 Mar 2007; Marius Mauch <genone@gentoo.org> bzr-0.13.ebuild,
+  bzr-0.14.ebuild:
+  Replacing einfo with elog
+
+*bzr-0.14 (26 Jan 2007)
+
+  26 Jan 2007; Marien Zwart <marienz@gentoo.org> -bzr-0.12.ebuild,
+  +bzr-0.14.ebuild:
+  Version bump, remove old ebuild.
+
+  18 Jan 2007; Ferris McCormick <fmccor@gentoo.org> bzr-0.13.ebuild:
+  Add ~sparc keyword. Builds, runs tests, and installs fine with USE='curl test
+  emacs'.
+
+*bzr-0.13 (05 Dec 2006)
+
+  05 Dec 2006; Marien Zwart <marienz@gentoo.org> -bzr-0.11.ebuild,
+  -bzr-0.13_rc1.ebuild, +bzr-0.13.ebuild:
+  Version bump, clean old versions.
+
+*bzr-0.13_rc1 (28 Nov 2006)
+
+  28 Nov 2006; Marien Zwart <marienz@gentoo.org> +bzr-0.13_rc1.ebuild:
+  Version bump (in package.mask).
+
+*bzr-0.12 (30 Oct 2006)
+
+  30 Oct 2006; Marien Zwart <marienz@gentoo.org> -bzr-0.10.ebuild,
+  -bzr-0.10-r1.ebuild, +bzr-0.12.ebuild:
+  Version bump, add curl USE flag.
+
+*bzr-0.11 (02 Oct 2006)
+
+  02 Oct 2006; Marien Zwart <marienz@gentoo.org> -bzr-0.9.ebuild,
+  -bzr-0.11_rc1.ebuild, -bzr-0.11_rc2.ebuild, +bzr-0.11.ebuild:
+  Version bump, remove old versions.
+
+*bzr-0.11_rc2 (27 Sep 2006)
+
+  27 Sep 2006; Marien Zwart <marienz@gentoo.org> +bzr-0.11_rc2.ebuild:
+  Version bump (still in package.mask).
+
+*bzr-0.11_rc1 (25 Sep 2006)
+
+  25 Sep 2006; Marien Zwart <marienz@gentoo.org> +bzr-0.11_rc1.ebuild:
+  Version bump (package.masked release candidate).
+
+*bzr-0.10-r1 (24 Sep 2006)
+
+  24 Sep 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.10-python-2.5-compat.patch, -bzr-0.6.2.ebuild,
+  -bzr-0.7.ebuild, -bzr-0.8.ebuild, -bzr-0.8.2.ebuild, -bzr-0.8.2-r1.ebuild,
+  bzr-0.9.ebuild, bzr-0.10.ebuild, +bzr-0.10-r1.ebuild:
+  Clean up old versions. Fix dependency bug spotted by Flameeyes. Bump to
+  0.10-r1 with a patch to mostly work with python 2.5.
+
+*bzr-0.10 (04 Sep 2006)
+
+  04 Sep 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.10-fix-manpage-location.patch, +bzr-0.10.ebuild:
+  Version bump.
+
+*bzr-0.9 (24 Aug 2006)
+
+  24 Aug 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.9-binary-diff.patch, +bzr-0.9.ebuild:
+  Version bump, closes bug #144312, thanks to Geoff Weber <janax99@yahoo.com>.
+
+  11 Jul 2006; Aron Griffis <agriffis@gentoo.org> bzr-0.8.2-r1.ebuild:
+  Mark 0.8.2-r1 ~ia64
+
+*bzr-0.8.2-r1 (25 May 2006)
+
+  25 May 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.8.2-push-repository.patch, files/70bzr-gentoo.el,
+  +bzr-0.8.2-r1.ebuild:
+  Add a patch from upstream for "bzr push" pushing too much. Do not include
+  the .el extension when loading bzr-mode so the .elc gets picked up.
+
+*bzr-0.8.2 (17 May 2006)
+
+  17 May 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.8.2-paramiko-1.6-compat.patch, +bzr-0.8.2.ebuild:
+  Version bump with a patch to work with paramiko-1.6 a bit better.
+
+*bzr-0.8 (14 May 2006)
+
+  14 May 2006; Marien Zwart <marienz@gentoo.org>
+  +files/bzr-0.8-fix-manpage-location.patch, -bzr-0.8_rc1.ebuild,
+  +bzr-0.8.ebuild:
+  Version bump with a patch to install the manpage in /usr/share/man instead
+  of /usr/man (thanks to exg for reporting).
+
+  14 May 2006; Diego Pettenò <flameeyes@gentoo.org> bzr-0.8_rc1.ebuild:
+  Add ~x86-fbsd keyword also to 0.8.
+
+  12 May 2006; Diego Pettenò <flameeyes@gentoo.org> bzr-0.7.ebuild:
+  Add ~x86-fbsd keyword.
+
+*bzr-0.8_rc1 (18 Apr 2006)
+
+  18 Apr 2006; Marien Zwart <marienz@gentoo.org> +bzr-0.8_rc1.ebuild:
+  Version bump.
+
+  02 Apr 2006; Marien Zwart <marienz@gentoo.org> -bzr-0.0.9.ebuild,
+  -bzr-0.6.ebuild, bzr-0.7.ebuild:
+  Fix paramiko dependency, thanks to AnMaster on irc for noticing it was not
+  specific enough. Remove old ebuilds.
+
+*bzr-0.7 (27 Jan 2006)
+
+  27 Jan 2006; Marien Zwart <marienz@gentoo.org> +files/70bzr-gentoo.el,
+  metadata.xml, +bzr-0.7.ebuild:
+  Version bump to 0.7 (bug #120487), add bash and zsh completion, emacs mode
+  (bug #120406) and src_test. Add myself and the python herd to metadata.xml.
+
+*bzr-0.6.2 (06 Jan 2006)
+
+  06 Jan 2006; Anders Rune Jensen <arj@gentoo.org> +bzr-0.6.2.ebuild:
+  New version.
+
+*bzr-0.6 (30 Oct 2005)
+
+  30 Oct 2005; Anders Rune Jensen <arj@gentoo.org> +bzr-0.6.ebuild,
+  -bzr-0.0.7.ebuild, -bzr-0.0.8.ebuild:
+  New version. Remove old versions.
+
+*bzr-0.0.9 (07 Oct 2005)
+
+  07 Oct 2005; Anders Rune Jensen <arj@gentoo.org> +bzr-0.0.9.ebuild:
+  New version
+
+*bzr-0.0.8 (20 Sep 2005)
+
+  20 Jul 2005; Anders Rune Jensen <arj@gentoo.org> +bzr-0.0.8.ebuild:
+  New version
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> -bzr-0.0.5.ebuild,
+  -bzr-0.0.4.ebuild:
+  Remove old versions. Fix #105244.
+	
+*bzr-0.0.7 (02 Sep 2005)
+
+  02 Sep 2005; Anders Rune Jensen <arj@gentoo.org> +bzr-0.0.7.ebuild:
+  New version
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> bzr-0.0.5.ebuild:
+  Added to ~ppc.
+
+*bzr-0.0.5 (05 Jul 2005)
+
+  05 Jul 2005; Anders Rune Jensen <arj@gentoo.org> +bzr-0.0.5.ebuild:
+  New version
+
+*bzr-0.0.4 (08 May 2005)
+
+  08 May 2005; Anders Rune Jensen <arj@gentoo.org> +bzr-0.0.4.ebuild:
+  Initial import. Fixes #91682.
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
new file mode 100644
index 000000000000..5e770abb9513
--- /dev/null
+++ b/dev-vcs/bzr/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 71bzr-gentoo.el 124 RMD160 d85713f80f9be8685bf56979626003f46ebbc22f SHA1 150e54685444e444e2328bb5cb9dbb1c68c066e0 SHA256 8033a55433689ba25acd502865086600d1a03158a88f4a596fae0e7d3d953454
+AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
+AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f1 SHA1 5608d6a2e2215453523441ff9890e11aebbc289e SHA256 8bff8a500f96bbade348a11fdc70d00f9166774b8cc0a08c8d8dd3e33326bbcc
+AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 SHA1 a118057a6f34b9ff2ddc90f01945820d87a983f3 SHA256 f213cd8a2f0444dd130a13e65ede34cade2da33b2ad739c8f4fd48e912ed7ebb
+AUX bzr-2.1-no-pyrex-citon.patch 1123 RMD160 54a57f24f76e555cb77a39c86d6702b3a2ee86ee SHA1 d769bb2f561234e4cf6106b470567537de48daed SHA256 8304a5078ebcfbcdbafdf0e84119b46a289940b6748bff61b158a35d03211157
+DIST bzr-2.0.1.tar.gz 6101477 RMD160 a48492a27942f1001c1270fc8bb974135328c4b5 SHA1 e19c05e052290746de54f65254e056e39ba5e018 SHA256 3438bd7b5d07486d85a63cf47a26f3532ef7fb4019770ca48faddfa9875e06c9
+DIST bzr-2.0.4.tar.gz 6613732 RMD160 e6159191e384ccc28e21bf30f1b5eb2937759310 SHA1 5f2c8558aceef2a790b1e65b1fa48577582446cd SHA256 6f601e4103b88cf3022add33e35d94408adc69fd9604a79e528c7bf036a1f72f
+DIST bzr-2.1.0.tar.gz 6787494 RMD160 c54ca16aca7811fc34b71ff852199afab3f19519 SHA1 cc7137c657d7918e833e64d77a267f8162d3a05d SHA256 7a1e9353eeabdc0f7ff540fb095994a93a6022e03063c9750faaf2d459277125
+EBUILD bzr-2.0.1.ebuild 3544 RMD160 ff4d64b2c1eca74d2952c017fe645cdfaba1a059 SHA1 7ca361c0f34809d8a0e3667df7b85bdae8f75d82 SHA256 ebaf2ef45992c6b69751ef8ddba631ae2d7f7b29c779361fb43c4cedb44f5135
+EBUILD bzr-2.0.4.ebuild 3629 RMD160 2858f1b9fc80fac5b7df873fcd694c6084b70f3c SHA1 ba25e2bf2227e29abecf77995743250c2fd543c7 SHA256 573b5c9d39fe37b000ee69637e32e5f58172367f1e89c07f3826d1b39c92be84
+EBUILD bzr-2.1.0.ebuild 3502 RMD160 949a837678923d6c3c28ebc0879cc8274897d2d6 SHA1 87df46ead1a4e5af5255f26076e5bb0074eb6428 SHA256 0cd9e601fccee8edc3c6ac5ce38e335afc20693447b4935fa8f8d64712b998dd
+MISC ChangeLog 19006 RMD160 8276f1fde4ed825184a0ddf2639370fde7b9c17e SHA1 3cd35b492a7bd1086dba8acd03d9d45f619890be SHA256 63e0469d0483a8d944476503b3d617e68ef4455df0bf2b45b13b552af20eb1e0
+MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuOIYkACgkQNQqtfCuFnePtHwCfZSEZR4An9jaGGGjvIf2R0ogd
+e0oAn0ukH1bWhvto7uKF70n03f47aiVm
+=WKji
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.0.1.ebuild b/dev-vcs/bzr/bzr-2.0.1.ebuild
new file mode 100644
index 000000000000..284f9a1f42cd
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.0.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.0.1.ebuild,v 1.1 2010/03/05 09:33:53 fauli Exp $
+
+EAPI=1
+
+NEED_PYTHON=2.4
+
+inherit distutils bash-completion elisp-common eutils versionator
+
+MY_PV=${PV/_rc/rc}
+MY_P=${PN}-${MY_PV}
+SERIES=$(get_version_component_range 1-2)
+
+DESCRIPTION="Bazaar is a next generation distributed version control system."
+HOMEPAGE="http://bazaar-vcs.org/"
+#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+SRC_URI="http://launchpad.net/bzr/${SERIES}/${MY_PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="curl doc emacs +sftp test"
+
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? (
+		$RDEPEND
+		dev-python/medusa
+	)"
+
+S="${WORKDIR}/${MY_P}"
+PYTHON_MODNAME="bzrlib"
+SITEFILE=71bzr-gentoo.el
+DOCS="doc/*.txt"
+
+src_unpack() {
+	distutils_src_unpack
+
+	# Don't regenerate .c files from .pyx when pyrex is found.
+	epatch "${FILESDIR}/${PN}-1.8-no-pyrex.patch"
+	# Don't run lock permission tests when running as root
+	epatch "${FILESDIR}/${PN}-0.90-tests-fix_root.patch"
+	# Fix permission errors when run under directories with setgid set.
+	epatch "${FILESDIR}/${PN}-0.90-tests-sgid.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use emacs; then
+		elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
+	fi
+}
+
+src_install() {
+	distutils_src_install --install-data /usr/share
+
+	if use doc; then
+		docinto developers
+		dodoc doc/developers/* || die "dodoc failed"
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto $doc
+			dodoc doc/en/$doc/* || die "dodoc failed"
+		done
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el* || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
+
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${D}${SITELISP}/${PN}/.nosearch"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh/_bzr
+	dobashcompletion contrib/bash/bzr
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+
+	if use emacs; then
+		elisp-site-regen
+		elog "If you are using a GNU Emacs version greater than 22.1, bzr support"
+		elog "is already included.  This ebuild does not automatically activate bzr support"
+		elog "in versions below, but prepares it in a way you can load it from your ~/.emacs"
+		elog "file by adding"
+		elog "       (load \"bzr-mode\")"
+	fi
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}
+
+src_test() {
+	export LC_ALL=C
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# Not reproducible in current dev version, so check and drop with version
+	# bump
+	skip_tests+="bzrlib.tests.test_osutils.TestWalkDirs|"
+	# https://bugs.launchpad.net/bzr/+bug/392127
+	skip_tests+="test_http.*"
+	skip_tests+=")"
+	# Some tests expect the usual pyc compiling behaviour.
+	python_enable_pyc
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+		"${python}" bzr --no-plugins selftest -x ${skip_tests} || die "bzr selftest failed"
+	else
+		"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+	fi
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}
diff --git a/dev-vcs/bzr/bzr-2.0.4.ebuild b/dev-vcs/bzr/bzr-2.0.4.ebuild
new file mode 100644
index 000000000000..601549f2d8a8
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.0.4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.0.4.ebuild,v 1.1 2010/03/05 09:33:53 fauli Exp $
+
+EAPI=3
+
+PYTHON_DEPEND=2
+
+inherit bash-completion distutils elisp-common eutils versionator
+
+MY_PV=${PV/_rc/rc}
+MY_P=${PN}-${MY_PV}
+SERIES=$(get_version_component_range 1-2)
+
+DESCRIPTION="Bazaar is a next generation distributed version control system."
+HOMEPAGE="http://bazaar-vcs.org/"
+#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+SRC_URI="http://launchpad.net/bzr/${SERIES}/${MY_PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE="curl doc emacs +sftp test"
+
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? (
+		$RDEPEND
+		dev-python/medusa
+	)"
+
+S="${WORKDIR}/${MY_P}"
+PYTHON_MODNAME="bzrlib"
+SITEFILE=71bzr-gentoo.el
+DOCS="doc/*.txt"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Don't regenerate .c files from .pyx when pyrex is found.
+	epatch "${FILESDIR}/${PN}-1.8-no-pyrex.patch"
+	# Don't run lock permission tests when running as root
+	epatch "${FILESDIR}/${PN}-0.90-tests-fix_root.patch"
+	# Fix permission errors when run under directories with setgid set.
+	epatch "${FILESDIR}/${PN}-0.90-tests-sgid.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use emacs; then
+		elisp-compile contrib/emacs/bzr-mode.el || die "Emacs modules failed!"
+	fi
+}
+
+src_install() {
+	distutils_src_install --install-data "${EPREFIX}"/usr/share
+
+	if use doc; then
+		docinto developers
+		dodoc doc/developers/* || die "dodoc failed"
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto $doc
+			dodoc doc/en/$doc/* || die "dodoc failed"
+		done
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el* || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die "elisp-site-file-install failed"
+
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/.nosearch"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh/_bzr
+	dobashcompletion contrib/bash/bzr
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+
+	if use emacs; then
+		elisp-site-regen
+		elog "If you are using a GNU Emacs version greater than 22.1, bzr support"
+		elog "is already included.  This ebuild does not automatically activate bzr support"
+		elog "in versions below, but prepares it in a way you can load it from your ~/.emacs"
+		elog "file by adding"
+		elog "       (load \"bzr-mode\")"
+	fi
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}
+
+src_test() {
+	export LC_ALL=C
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	# Not reproducible in current dev version, so check and drop with version
+	# bump
+	skip_tests+="bzrlib.tests.test_osutils.TestWalkDirs|"
+	# https://bugs.launchpad.net/bzr/+bug/392127
+	skip_tests+="test_http.*"
+	skip_tests+=")"
+	# Some tests expect the usual pyc compiling behaviour.
+	python_enable_pyc
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+		"${python}" bzr --no-plugins selftest -x ${skip_tests} || die "bzr selftest failed"
+	else
+		"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+	fi
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}
diff --git a/dev-vcs/bzr/bzr-2.1.0.ebuild b/dev-vcs/bzr/bzr-2.1.0.ebuild
new file mode 100644
index 000000000000..9ac5d5b9b600
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.1.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.1.0.ebuild,v 1.1 2010/03/05 09:33:53 fauli Exp $
+
+EAPI=3
+
+PYTHON_DEPEND=2
+
+inherit bash-completion distutils elisp-common eutils versionator
+
+MY_P=${PN}-${PV}
+SERIES=$(get_version_component_range 1-2)
+
+DESCRIPTION="Bazaar is a next generation distributed version control system."
+HOMEPAGE="http://bazaar-vcs.org/"
+#SRC_URI="http://bazaar-vcs.org/releases/src/${MY_P}.tar.gz"
+SRC_URI="http://launchpad.net/bzr/${SERIES}/${PV}/+download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE="curl doc emacs +sftp test"
+
+# Disable until https://bugs.launchpad.net/bzr/+bug/392127 is fixed
+RESTRICT=test
+
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? (
+		$RDEPEND
+		dev-python/medusa
+	)"
+
+S="${WORKDIR}/${MY_P}"
+PYTHON_MODNAME="bzrlib"
+SITEFILE=71bzr-gentoo.el
+DOCS="doc/*.txt"
+
+src_prepare() {
+	distutils_src_prepare
+
+	# Don't regenerate .c files from .pyx when pyrex is found.
+	epatch "${FILESDIR}/${PN}-2.1-no-pyrex-citon.patch"
+	# Don't run lock permission tests when running as root
+	epatch "${FILESDIR}/${PN}-0.90-tests-fix_root.patch"
+	# Fix permission errors when run under directories with setgid set.
+	epatch "${FILESDIR}/${PN}-0.90-tests-sgid.patch"
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use emacs; then
+		elisp-compile contrib/emacs/bzr-mode.el || die
+	fi
+}
+
+src_install() {
+	distutils_src_install --install-data "${EPREFIX}"/usr/share
+
+	if use doc; then
+		docinto developers
+		dodoc doc/developers/* || die
+		for doc in mini-tutorial tutorials user-{guide,reference}; do
+			docinto $doc
+			dodoc doc/en/$doc/* || die
+		done
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} contrib/emacs/*.el* || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/.nosearch"
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh/_bzr
+	dobashcompletion contrib/bash/bzr
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	bash-completion_pkg_postinst
+
+	if use emacs; then
+		elisp-site-regen
+		elog "If you are using a GNU Emacs version greater than 22.1, bzr support"
+		elog "is already included.  This ebuild does not automatically activate bzr support"
+		elog "in versions below, but prepares it in a way you can load it from your ~/.emacs"
+		elog "file by adding"
+		elog "       (load \"bzr-mode\")"
+	fi
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	use emacs && elisp-site-regen
+}
+
+src_test() {
+	export LC_ALL=C
+	# Define tests which are known to fail below.
+	local skip_tests="("
+	#https://bugs.launchpad.net/bzr/+bug/456471
+	skip_tests+="bzrlib.tests.blackbox.test_version.*|"
+	# https://bugs.launchpad.net/bzr/+bug/392127
+	skip_tests+="test_http.*"
+	skip_tests+=")"
+	# Some tests expect the usual pyc compiling behaviour.
+	python_enable_pyc
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+		"$(PYTHON -A)" bzr --no-plugins selftest -x ${skip_tests} || die
+	else
+		"$(PYTHON -A)" bzr --no-plugins selftest || die
+	fi
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}
diff --git a/dev-vcs/bzr/files/71bzr-gentoo.el b/dev-vcs/bzr/files/71bzr-gentoo.el
new file mode 100644
index 000000000000..e8af05fb6ed6
--- /dev/null
+++ b/dev-vcs/bzr/files/71bzr-gentoo.el
@@ -0,0 +1,5 @@
+
+;;; dev-util/bzr site-lisp configuration
+
+(unless (fboundp 'vc-bzr-registered)
+     (add-to-list 'load-path "@SITELISP@"))
diff --git a/dev-vcs/bzr/files/bzr-0.90-tests-fix_root.patch b/dev-vcs/bzr/files/bzr-0.90-tests-fix_root.patch
new file mode 100644
index 000000000000..03f95b33da3e
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-0.90-tests-fix_root.patch
@@ -0,0 +1,30 @@
+--- bzrlib/tests/test_lockdir.py	2007-08-28 22:51:01.000000000 +0300
++++ bzrlib/tests/test_lockdir.py	2007-08-31 15:54:46.000000000 +0300
+@@ -594,6 +594,8 @@
+     def test_lock_permission(self):
+         if not osutils.supports_posix_readonly():
+             raise tests.TestSkipped('Cannot induce a permission failure')
++        if not os.getuid():
++            raise tests.TestSkipped('Running as root')
+         ld1 = self.get_lock()
+         lock_path = ld1.transport.local_abspath('test_lock')
+         os.mkdir(lock_path)
+--- bzrlib/tests/per_lock/test_lock.py  2007-08-28 22:51:00.000000000 +0300
++++ bzrlib/tests/per_lock/test_lock.py	2007-08-31 16:34:22.000000000 +0300
+@@ -22,6 +22,7 @@
+     )
+ 
+ from bzrlib.tests.per_lock import TestCaseWithLock
++from bzrlib.tests import TestSkipped
+ 
+ 
+ class TestLock(TestCaseWithLock):
+@@ -62,6 +63,8 @@
+ 
+         But we shouldn't be able to take a write lock.
+         """
++        if not osutils.os.getuid():
++            raise TestSkipped('Running as root')
+         osutils.make_readonly('a-file')
+         # Make sure the file is read-only (on all platforms)
+         self.assertRaises(IOError, open, 'a-file', 'rb+')
diff --git a/dev-vcs/bzr/files/bzr-0.90-tests-sgid.patch b/dev-vcs/bzr/files/bzr-0.90-tests-sgid.patch
new file mode 100644
index 000000000000..34901e90b73d
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-0.90-tests-sgid.patch
@@ -0,0 +1,13 @@
+https://bugs.launchpad.net/bzr/+bug/109124
+--- bzrlib/tests/__init__.py	2007-08-28 22:50:57.000000000 +0300
++++ bzrlib/tests/__init__.py	2007-08-31 14:28:44.000000000 +0300
+@@ -933,6 +933,9 @@
+             return
+         path_stat = transport.stat(path)
+         actual_mode = stat.S_IMODE(path_stat.st_mode)
++        # test if running beneath a directory with the setgid bit set.
++        if actual_mode & stat.S_ISGID and not mode & stat.S_ISGID:
++            mode |= stat.S_ISGID
+         self.assertEqual(mode, actual_mode,
+             'mode of %r incorrect (%o != %o)' % (path, mode, actual_mode))
+ 
diff --git a/dev-vcs/bzr/files/bzr-1.8-no-pyrex.patch b/dev-vcs/bzr/files/bzr-1.8-no-pyrex.patch
new file mode 100644
index 000000000000..92d097735a31
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-1.8-no-pyrex.patch
@@ -0,0 +1,29 @@
+=== modified file 'setup.py'
+--- setup.py	2008-10-07 11:20:18 +0000
++++ setup.py	2008-10-07 11:21:14 +0000
+@@ -161,22 +161,8 @@
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+ from distutils.extension import Extension
+ ext_modules = []
+-try:
+-    from Pyrex.Distutils import build_ext
+-except ImportError:
+-    have_pyrex = False
+-    # try to build the extension from the prior generated source.
+-    print
+-    print ("The python package 'Pyrex' is not available."
+-           " If the .c files are available,")
+-    print ("they will be built,"
+-           " but modifying the .pyx files will not rebuild them.")
+-    print
+-    from distutils.command.build_ext import build_ext
+-else:
+-    have_pyrex = True
+-    from Pyrex.Compiler.Version import version as pyrex_version
+-
++have_pyrex = False
++from distutils.command.build_ext import build_ext
+ 
+ class build_ext_if_possible(build_ext):
+ 
+
diff --git a/dev-vcs/bzr/files/bzr-2.1-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.1-no-pyrex-citon.patch
new file mode 100644
index 000000000000..3d394b84a4ea
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-2.1-no-pyrex-citon.patch
@@ -0,0 +1,34 @@
+=== modified file 'setup.py'
+--- setup.py	2009-10-20 14:04:31 +0000
++++ setup.py	2009-10-20 14:05:01 +0000
+@@ -166,26 +166,9 @@
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+ from distutils.extension import Extension
+ ext_modules = []
+-try:
+-    try:
+-        from Pyrex.Distutils import build_ext
+-        from Pyrex.Compiler.Version import version as pyrex_version
+-    except ImportError:
+-        print "No Pyrex, trying Cython..."
+-        from Cython.Distutils import build_ext
+-        from Cython.Compiler.Version import version as pyrex_version
+-except ImportError:
+-    have_pyrex = False
+-    # try to build the extension from the prior generated source.
+-    print
+-    print ("The python package 'Pyrex' is not available."
+-           " If the .c files are available,")
+-    print ("they will be built,"
+-           " but modifying the .pyx files will not rebuild them.")
+-    print
+-    from distutils.command.build_ext import build_ext
+-else:
+-    have_pyrex = True
++
++have_pyrex = False
++from distutils.command.build_ext import build_ext
+ 
+ 
+ class build_ext_if_possible(build_ext):
+
diff --git a/dev-vcs/bzr/metadata.xml b/dev-vcs/bzr/metadata.xml
new file mode 100644
index 000000000000..ada4a1a18fef
--- /dev/null
+++ b/dev-vcs/bzr/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>python</herd>
+  <herd>bazaar</herd>
+  <longdescription lang="en">
+    Bazaar (``bzr``) is a decentralized revision control system, designed to be
+    easy for developers and end users alike.  Bazaar is part of the GNU project
+    to develop a complete free operating system.
+    Bazaar was formerly known as Bazaar-NG.  It's the successor to ``baz``, a
+    fork of GNU arch, but shares no code.  (To upgrade from Baz, use the
+    ``baz-import`` command in the bzrtools plugin.)
+  </longdescription>
+  <use>
+    <flag name="sftp">Enable sftp support</flag>
+  </use>
+</pkgmetadata>