Version bump.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 i686)

2 files changed, 110 insertions, 298 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 7bc347d75384..3638940c0437 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,303 +1,9 @@
 # ChangeLog for dev-util/bzr
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.57 2008/08/25 23:10:29 pva Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.58 2008/09/07 16:49:08 pva Exp $
 
-*bzr-1.6 (25 Aug 2008)
+*bzr-1.6.1 (07 Sep 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:
+  07 Sep 2008; Peter Volkov <pva@gentoo.org> +bzr-1.6.1.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-util/bzr/bzr-1.6.1.ebuild b/dev-util/bzr/bzr-1.6.1.ebuild
new file mode 100644
index 000000000000..c65fc71cef8e
--- /dev/null
+++ b/dev-util/bzr/bzr-1.6.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.6.1.ebuild,v 1.1 2008/09/07 16:49:08 pva Exp $
+
+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="~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="curl emacs sftp test"
+
+RDEPEND="|| ( dev-python/celementtree >=dev-lang/python-2.5 )
+	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}-0.92-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
+
+	docinto developers
+	dodoc doc/developers/*
+	for doc in mini-tutorial tutorials user-{guide,reference}; do
+		docinto $doc
+		dodoc doc/en/$doc/*
+	done
+
+	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() {
+	# Some tests expect the usual pyc compiling behaviour.
+	unset PYTHON_DONTCOMPILE
+	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
+	# Just to make sure we don't hit any errors on later stages.
+	export PYTHON_DONTCOMPILE=1
+}