11 files changed, 26 insertions, 351 deletions
diff --git a/dev-util/bzr/Manifest b/dev-util/bzr/Manifest
index e82acf61bdc7..1e4a341329ad 100644
--- a/dev-util/bzr/Manifest
+++ b/dev-util/bzr/Manifest
@@ -9,6 +9,10 @@ AUX bzr-0.10-fix-manpage-location.patch 438 RMD160 01e1a08e312ee80e14abb716f043e
 MD5 85c2ae99b48cedc73b723d2916b441e8 files/bzr-0.10-fix-manpage-location.patch 438
 RMD160 01e1a08e312ee80e14abb716f043e40f6c332218 files/bzr-0.10-fix-manpage-location.patch 438
 SHA256 2bdcccd82a9d81ade3e2a4f9b1948516bce1219d509fe14ed6e5bad0821a14a5 files/bzr-0.10-fix-manpage-location.patch 438
+AUX bzr-0.10-python-2.5-compat.patch 1692 RMD160 0b0296da7ff64b5331ef287e78f32556b9e21938 SHA1 e90213aa2b2e2146c009b086f0e30457ed706eeb SHA256 7929a354ebc8643e25f520bf3a6eb2310a0ec0fbf5b5a596832e3650a6379aa1
+MD5 fba9d1c4211cdaf371f19aeff711bb42 files/bzr-0.10-python-2.5-compat.patch 1692
+RMD160 0b0296da7ff64b5331ef287e78f32556b9e21938 files/bzr-0.10-python-2.5-compat.patch 1692
+SHA256 7929a354ebc8643e25f520bf3a6eb2310a0ec0fbf5b5a596832e3650a6379aa1 files/bzr-0.10-python-2.5-compat.patch 1692
 AUX bzr-0.8-fix-manpage-location.patch 361 RMD160 1b93e88bc04a5f8c1c5f9c75720329e6077cc6de SHA1 ec0c0cc45ae717a6a8a998f64afdda9219a8ba6d SHA256 4bc85843e10660bb95cf12f758aaa92053db0c5ff82bd5479d8d4090a5935305
 MD5 4c2a989947fc7aeabffd234649aaf6c6 files/bzr-0.8-fix-manpage-location.patch 361
 RMD160 1b93e88bc04a5f8c1c5f9c75720329e6077cc6de files/bzr-0.8-fix-manpage-location.patch 361
@@ -26,43 +30,23 @@ MD5 56bc12a57f4b60f074871a84be58d6b7 files/bzr-0.9-binary-diff.patch 3660
 RMD160 6272a1ae8b7bcbd52a02b7e2687167ff6b70bf50 files/bzr-0.9-binary-diff.patch 3660
 SHA256 a00e42dc7161d96a13e8f279862174ba2bd534e8da68d46c9a60f7308e96714b files/bzr-0.9-binary-diff.patch 3660
 DIST bzr-0.10.tar.gz 950911 RMD160 046dd9479e516b6e9b526df5f9baa2a7ec185a5b SHA1 d3cf0662e3b20678fb3161a0bb1cab4fa2d40e2a SHA256 4a9b5b2d0b2c33c91dabeb0831b3da660189eb38ad9c28c929ea64b79fecc20f
-DIST bzr-0.6.2.tar.gz 519926
-DIST bzr-0.7.tar.gz 569679 RMD160 e207ed79ffd9e88e5f7ab4b618bd584f4734fff4 SHA256 a9abf88785f0d2c397de9cf4ef02cb63462b1458f583d3ce48cd6f7c21e7a36b
-DIST bzr-0.8.2.tar.gz 720152 RMD160 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251 SHA1 1aea6e0783219f0c2d074c9407ad09cb36b4ade2 SHA256 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144
-DIST bzr-0.8.tar.gz 711210 RMD160 feb6f6c4a4a7b3b5d4741c7567f918a34a393305 SHA256 018617c70ff979e25c89a6aa70a3751253d498e3666e775b464e3ccdc6c8b709
 DIST bzr-0.9.tar.gz 935724 RMD160 e01328785bae9d275cc71311627a11edb5a89224 SHA1 6150ce2b814a738a72e3aab6d081769f9d2e14fe SHA256 a50ec64ee581d9ecfb0b87098398b3fbbe19c9bd55a7782f75fe7232d83fcf90
-EBUILD bzr-0.10.ebuild 1790 RMD160 482c8d112f96cf18fd0d36eae55f8dfa1a4db10d SHA1 cb778f667b546be469fb85b8631f0b761a648118 SHA256 0a78474c1634756d036a913144739bfe3fdc0491df6269438b786f6f03dad3e8
-MD5 7981d13b45e9d19303909a0649d4807b bzr-0.10.ebuild 1790
-RMD160 482c8d112f96cf18fd0d36eae55f8dfa1a4db10d bzr-0.10.ebuild 1790
-SHA256 0a78474c1634756d036a913144739bfe3fdc0491df6269438b786f6f03dad3e8 bzr-0.10.ebuild 1790
-EBUILD bzr-0.6.2.ebuild 688 RMD160 176f7037e1667044212974a2c7dde0033b52f3dc SHA1 9bf0d2a0edfdb148def26eb67587c69c40f03a44 SHA256 126b060b2665d79e7c9f01de43b99dd0ec6d214e7777076285215120eb106b86
-MD5 bd513588df0e2bd410c43e79b6e2890e bzr-0.6.2.ebuild 688
-RMD160 176f7037e1667044212974a2c7dde0033b52f3dc bzr-0.6.2.ebuild 688
-SHA256 126b060b2665d79e7c9f01de43b99dd0ec6d214e7777076285215120eb106b86 bzr-0.6.2.ebuild 688
-EBUILD bzr-0.7.ebuild 1413 RMD160 d7da73ae2cb0b84b49152ae11837d99c3b5dd807 SHA1 2d6ca6da0927943a96dcf78d1b60508b7512a54a SHA256 783b958807653e4c05646948d888b293d4321b9a729d0c83ac06aa42d335254e
-MD5 78fc1443571af7893f8da6660885c271 bzr-0.7.ebuild 1413
-RMD160 d7da73ae2cb0b84b49152ae11837d99c3b5dd807 bzr-0.7.ebuild 1413
-SHA256 783b958807653e4c05646948d888b293d4321b9a729d0c83ac06aa42d335254e bzr-0.7.ebuild 1413
-EBUILD bzr-0.8.2-r1.ebuild 1815 RMD160 97413db2fc655345d73b6435f686dc1cf7e4b5a1 SHA1 9763010a29c1358cb0a624db0cf8a614dfaebe47 SHA256 e3c9a28c0fff638fa94c599e472461586581c5cbcf85726ce09fcfe22cb99976
-MD5 09715f9e61dc61be48560397e763fecb bzr-0.8.2-r1.ebuild 1815
-RMD160 97413db2fc655345d73b6435f686dc1cf7e4b5a1 bzr-0.8.2-r1.ebuild 1815
-SHA256 e3c9a28c0fff638fa94c599e472461586581c5cbcf85726ce09fcfe22cb99976 bzr-0.8.2-r1.ebuild 1815
-EBUILD bzr-0.8.2.ebuild 1549 RMD160 d70397237d649c44e3eb9772a4b7305f6b99818d SHA1 457c460401fabbacebcb68947f541680cea00909 SHA256 0735257f8c32de69858e8d0e8ffad79e788d22cfaad0aca51525e40088bafa7a
-MD5 fa17ea9329a68097c5670e8cfb6df329 bzr-0.8.2.ebuild 1549
-RMD160 d70397237d649c44e3eb9772a4b7305f6b99818d bzr-0.8.2.ebuild 1549
-SHA256 0735257f8c32de69858e8d0e8ffad79e788d22cfaad0aca51525e40088bafa7a bzr-0.8.2.ebuild 1549
-EBUILD bzr-0.8.ebuild 1489 RMD160 a9f3313c6a373bffd44a3613d6903885bb4f475d SHA1 2cc37fe96e0bc2c3139504f2e1e665b8e7f0fa27 SHA256 30c9ff192efd0039fc00fa95abc8d7f3871a79b68eef22ff1add5e0a6e106b1f
-MD5 9d211aa8b58d8fa33896c99daa71fa50 bzr-0.8.ebuild 1489
-RMD160 a9f3313c6a373bffd44a3613d6903885bb4f475d bzr-0.8.ebuild 1489
-SHA256 30c9ff192efd0039fc00fa95abc8d7f3871a79b68eef22ff1add5e0a6e106b1f bzr-0.8.ebuild 1489
-EBUILD bzr-0.9.ebuild 1883 RMD160 934fdb9497b2f64e955ab81087b282c96bb1a87c SHA1 3376fe13a759f239a861effcb81f2796e95ac506 SHA256 7ec0dfc9f2de9785942f2f60a6af304be84c508283eec4b3acf7a8d6d5a6bec6
-MD5 6610b1201dad5f9b537bd74a0d828992 bzr-0.9.ebuild 1883
-RMD160 934fdb9497b2f64e955ab81087b282c96bb1a87c bzr-0.9.ebuild 1883
-SHA256 7ec0dfc9f2de9785942f2f60a6af304be84c508283eec4b3acf7a8d6d5a6bec6 bzr-0.9.ebuild 1883
-MISC ChangeLog 3342 RMD160 1bc08cc186186d2036060ca34e10cddb4a1f7379 SHA1 0a16a0a0ea22e6b4a05086897fe1095cfd6f585e SHA256 f94fef4fb16002696c73b9037f92b0fcbbe2e3cfad0e6b8f4250dd2c1be48551
-MD5 bb4a3222a63215596acec52d99f875f3 ChangeLog 3342
-RMD160 1bc08cc186186d2036060ca34e10cddb4a1f7379 ChangeLog 3342
-SHA256 f94fef4fb16002696c73b9037f92b0fcbbe2e3cfad0e6b8f4250dd2c1be48551 ChangeLog 3342
+EBUILD bzr-0.10-r1.ebuild 2048 RMD160 fcca7c85632376226ddba74149b61fe53b1161c8 SHA1 290745481e4d829ee2e2d62e8dab1080046ed847 SHA256 c18bae17227fb29cc92788968e3263f31dfa823566a2c499e22d7c1aa04dab2a
+MD5 a4fff8e769cf8f8a63774df2b364025b bzr-0.10-r1.ebuild 2048
+RMD160 fcca7c85632376226ddba74149b61fe53b1161c8 bzr-0.10-r1.ebuild 2048
+SHA256 c18bae17227fb29cc92788968e3263f31dfa823566a2c499e22d7c1aa04dab2a bzr-0.10-r1.ebuild 2048
+EBUILD bzr-0.10.ebuild 1877 RMD160 aaae7e5748b438bfa0825815979cd40fe07974af SHA1 a94b038f457adf84aac61eb850e0f4e20f5bc29c SHA256 4adb46fd5775d5072633cce158de835d152e0e378f3d9b33a1c1f6c6618da57e
+MD5 5081318e817501cc30ce8f3b216674ad bzr-0.10.ebuild 1877
+RMD160 aaae7e5748b438bfa0825815979cd40fe07974af bzr-0.10.ebuild 1877
+SHA256 4adb46fd5775d5072633cce158de835d152e0e378f3d9b33a1c1f6c6618da57e bzr-0.10.ebuild 1877
+EBUILD bzr-0.9.ebuild 1970 RMD160 52fddc843cc0d717f6da981a4daa0dd90f8513e2 SHA1 44e7695126fe93da50e9808568111fbd7eca0e64 SHA256 b7fdc41a3aba7c44f09ca14535cf9aae62a6bc432f2bdc7411cafd7d2018da33
+MD5 4e802871a8c23d8600489e887a028a62 bzr-0.9.ebuild 1970
+RMD160 52fddc843cc0d717f6da981a4daa0dd90f8513e2 bzr-0.9.ebuild 1970
+SHA256 b7fdc41a3aba7c44f09ca14535cf9aae62a6bc432f2bdc7411cafd7d2018da33 bzr-0.9.ebuild 1970
+MISC ChangeLog 3744 RMD160 4746e1e0fe0cbc48cc62b4496935f6393e3f11ff SHA1 c3e7bd07408cac32bbbe652dc1ef169037deed98 SHA256 e87885ab71e36455bce73d8ee61cf88b999759ce3d64c3621ab80892673e37ea
+MD5 c65e6ee22be082c18e20bf98166a9cb3 ChangeLog 3744
+RMD160 4746e1e0fe0cbc48cc62b4496935f6393e3f11ff ChangeLog 3744
+SHA256 e87885ab71e36455bce73d8ee61cf88b999759ce3d64c3621ab80892673e37ea ChangeLog 3744
 MISC metadata.xml 218 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b SHA1 0dc0efeb1f1c4a4e691f1f10d4dd28814582c74e SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2
 MD5 bc29fb845d6836abeba3eeff41da8476 metadata.xml 218
 RMD160 0daf1f824cd7035b959dfc437279171ce5f1075b metadata.xml 218
@@ -70,28 +54,16 @@ SHA256 1ac3509e75b2cc8bf394a0c7e068039cc0152de1feae40a64b401365c9db67b2 metadata
 MD5 a3776c07753c3aa16849d9c78a184c26 files/digest-bzr-0.10 226
 RMD160 aec5a4186769b27ef2215af354bde68765f35835 files/digest-bzr-0.10 226
 SHA256 28ba75424157825714d6121567c2d8588c245052c1f491015ddea92ec5edea3c files/digest-bzr-0.10 226
-MD5 61a5c235b1f05bbb3f8c606866941097 files/digest-bzr-0.6.2 61
-RMD160 6c3c5290e4cb86c78b030d69755635a4de8eaef1 files/digest-bzr-0.6.2 61
-SHA256 5c83e07b2c846c3235d8a68926c41c1a1df0ac5dd339b3b2774fbc9716c8da70 files/digest-bzr-0.6.2 61
-MD5 5617466dc1420b8d09586f5cb4a05585 files/digest-bzr-0.7 223
-RMD160 d3fa94235428a80a02ef091eb8be51f984094204 files/digest-bzr-0.7 223
-SHA256 5a18788b3530e5eb6b81f637238246d44885fde9f2920e9f14803e80403aca5c files/digest-bzr-0.7 223
-MD5 faca1051cdcb5bbfbd8097d23bbd135f files/digest-bzr-0.8 223
-RMD160 e3eba998e939dfd9c36aae9e3ca435bddfccff55 files/digest-bzr-0.8 223
-SHA256 d734e1283f7c1dfe69c7dc8f9d42322c448bd3879b6b1da4d3e920c7ffb57244 files/digest-bzr-0.8 223
-MD5 d4d24a55ecf715cc1765e93869077983 files/digest-bzr-0.8.2 229
-RMD160 d123b886d50cead37ab0b571d07fb1ce5e67517e files/digest-bzr-0.8.2 229
-SHA256 25d4d1bbe75418759a594aa64f16a162827e85556b5ee68645705fce67922b67 files/digest-bzr-0.8.2 229
-MD5 d4d24a55ecf715cc1765e93869077983 files/digest-bzr-0.8.2-r1 229
-RMD160 d123b886d50cead37ab0b571d07fb1ce5e67517e files/digest-bzr-0.8.2-r1 229
-SHA256 25d4d1bbe75418759a594aa64f16a162827e85556b5ee68645705fce67922b67 files/digest-bzr-0.8.2-r1 229
+MD5 a3776c07753c3aa16849d9c78a184c26 files/digest-bzr-0.10-r1 226
+RMD160 aec5a4186769b27ef2215af354bde68765f35835 files/digest-bzr-0.10-r1 226
+SHA256 28ba75424157825714d6121567c2d8588c245052c1f491015ddea92ec5edea3c files/digest-bzr-0.10-r1 226
 MD5 186a8f6a71ee1958b19bf7c7e0075afe files/digest-bzr-0.9 223
 RMD160 4f39999920b2adeca251e36a5de025dfd6e496bd files/digest-bzr-0.9 223
 SHA256 61330a8f76d1dde491b11ea7a4df94e63de971500a477ebf73f6d23297e5967d files/digest-bzr-0.9 223
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE/Ep7UElL7eJpfEQRAmf3AJ9dobXmyxs8yB6s7E5dZReRcNZb8QCgqXmw
-LAHePGQGjW1L2LDdrQiR820=
-=aV2L
+iD8DBQFFFvGsUElL7eJpfEQRAg7sAKCp0Tb7hsFgpJKdGuqo8FoRbc53xQCgtXCf
+eSo9wlmTQM6u6/cYq0fgGms=
+=aFrl
 -----END PGP SIGNATURE-----
diff --git a/dev-util/bzr/bzr-0.6.2.ebuild b/dev-util/bzr/bzr-0.6.2.ebuild
deleted file mode 100644
index 57cfabde3b2e..000000000000
--- a/dev-util/bzr/bzr-0.6.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.6.2.ebuild,v 1.1 2006/01/07 01:20:43 arj Exp $
-
-inherit distutils
-MY_P="bzr-${PV}"
-PYTHON_MODNAME="bzrlib"
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-ng.org/"
-SRC_URI="http://bazaar-ng.org/pkg/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-DEPEND=">=dev-lang/python-2.4
-	dev-python/elementtree"
-S="${WORKDIR}/${MY_P}"
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	einfo "You may optionally \033[1memerge dev-python/celementtree\033[0m for faster processing."
-}
diff --git a/dev-util/bzr/bzr-0.7.ebuild b/dev-util/bzr/bzr-0.7.ebuild
deleted file mode 100644
index 461285adfc2c..000000000000
--- a/dev-util/bzr/bzr-0.7.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.7.ebuild,v 1.3 2006/05/12 22:32:53 flameeyes Exp $
-
-inherit distutils bash-completion elisp-common
-
-MY_P=${P/_rc/rc}
-
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-ng.org/"
-SRC_URI="http://bazaar-ng.org/pkg/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="emacs"
-
-DEPEND=">=dev-lang/python-2.4
-	dev-python/celementtree
-	emacs? ( virtual/emacs )
-	>=dev-python/paramiko-1.5"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="bzrlib"
-
-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
-	if use emacs; then
-		insinto ${SITELISP}
-		doins contrib/emacs/bzr-mode.el*
-		elisp-site-file-install ${FILESDIR}/70bzr-gentoo.el
-	fi
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh/_bzr
-	dobashcompletion contrib/bash/bzr
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
-
-src_test() {
-	"${python}" bzr selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/bzr-0.8.2-r1.ebuild b/dev-util/bzr/bzr-0.8.2-r1.ebuild
deleted file mode 100644
index 453cde6be120..000000000000
--- a/dev-util/bzr/bzr-0.8.2-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.8.2-r1.ebuild,v 1.2 2006/07/11 17:45:50 agriffis Exp $
-
-inherit distutils bash-completion elisp-common eutils
-
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-vcs.org/"
-SRC_URI="http://bazaar-vcs.org/pkg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
-IUSE="emacs"
-
-DEPEND=">=dev-lang/python-2.4
-	dev-python/celementtree
-	emacs? ( virtual/emacs )
-	>=dev-python/paramiko-1.5"
-
-PYTHON_MODNAME="bzrlib"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Install manpage in /usr/share/man instead of /usr/man
-	epatch "${FILESDIR}/${PN}-0.8-fix-manpage-location.patch"
-
-	# Make the tests and paramiko-1.6 cooperate better (applied upstream)
-	epatch "${FILESDIR}/${P}-paramiko-1.6-compat.patch"
-
-	# Make pushing a branch in a repo not push the entire repo (from upstream)
-	epatch "${FILESDIR}/${P}-push-repository.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
-	if use emacs; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/bzr-mode.el*
-		elisp-site-file-install "${FILESDIR}/70bzr-gentoo.el"
-	fi
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh/_bzr
-	dobashcompletion contrib/bash/bzr
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
-
-src_test() {
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/bzr-0.8.2.ebuild b/dev-util/bzr/bzr-0.8.2.ebuild
deleted file mode 100644
index 02b270018fc3..000000000000
--- a/dev-util/bzr/bzr-0.8.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.8.2.ebuild,v 1.1 2006/05/17 17:03:13 marienz Exp $
-
-inherit distutils bash-completion elisp-common eutils
-
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-vcs.org/"
-SRC_URI="http://bazaar-vcs.org/pkg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="emacs"
-
-DEPEND=">=dev-lang/python-2.4
-	dev-python/celementtree
-	emacs? ( virtual/emacs )
-	>=dev-python/paramiko-1.5"
-
-PYTHON_MODNAME="bzrlib"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.8-fix-manpage-location.patch"
-	epatch "${FILESDIR}/${P}-paramiko-1.6-compat.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
-	if use emacs; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/bzr-mode.el*
-		elisp-site-file-install "${FILESDIR}/70bzr-gentoo.el"
-	fi
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh/_bzr
-	dobashcompletion contrib/bash/bzr
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
-
-src_test() {
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/bzr-0.8.ebuild b/dev-util/bzr/bzr-0.8.ebuild
deleted file mode 100644
index 832c561827d2..000000000000
--- a/dev-util/bzr/bzr-0.8.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.8.ebuild,v 1.1 2006/05/14 16:40:59 marienz Exp $
-
-inherit distutils bash-completion elisp-common eutils
-
-DESCRIPTION="next generation distributed version control"
-HOMEPAGE="http://bazaar-vcs.org/"
-SRC_URI="http://bazaar-vcs.org/pkg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="emacs"
-
-DEPEND=">=dev-lang/python-2.4
-	dev-python/celementtree
-	emacs? ( virtual/emacs )
-	>=dev-python/paramiko-1.5"
-
-PYTHON_MODNAME="bzrlib"
-
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fix-manpage-location.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
-	if use emacs; then
-		insinto "${SITELISP}"
-		doins contrib/emacs/bzr-mode.el*
-		elisp-site-file-install "${FILESDIR}/70bzr-gentoo.el"
-	fi
-	insinto /usr/share/zsh/site-functions
-	doins contrib/zsh/_bzr
-	dobashcompletion contrib/bash/bzr
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	use emacs && elisp-site-regen
-	bash-completion_pkg_postinst
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	# regenerate site-gentoo if we are merged USE=emacs and unmerged
-	# USE=-emacs
-	has_version virtual/emacs && elisp-site-regen
-}
-
-src_test() {
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/files/digest-bzr-0.6.2 b/dev-util/bzr/files/digest-bzr-0.6.2
deleted file mode 100644
index 8deba3218009..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df3216cc53e86756d203869b94fee6b8 bzr-0.6.2.tar.gz 519926
diff --git a/dev-util/bzr/files/digest-bzr-0.7 b/dev-util/bzr/files/digest-bzr-0.7
deleted file mode 100644
index 75af030f14db..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz 569679
-RMD160 e207ed79ffd9e88e5f7ab4b618bd584f4734fff4 bzr-0.7.tar.gz 569679
-SHA256 a9abf88785f0d2c397de9cf4ef02cb63462b1458f583d3ce48cd6f7c21e7a36b bzr-0.7.tar.gz 569679
diff --git a/dev-util/bzr/files/digest-bzr-0.8 b/dev-util/bzr/files/digest-bzr-0.8
deleted file mode 100644
index e44c0d704df0..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz 711210
-RMD160 feb6f6c4a4a7b3b5d4741c7567f918a34a393305 bzr-0.8.tar.gz 711210
-SHA256 018617c70ff979e25c89a6aa70a3751253d498e3666e775b464e3ccdc6c8b709 bzr-0.8.tar.gz 711210
diff --git a/dev-util/bzr/files/digest-bzr-0.8.2 b/dev-util/bzr/files/digest-bzr-0.8.2
deleted file mode 100644
index bddfa5c5c678..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz 720152
-RMD160 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251 bzr-0.8.2.tar.gz 720152
-SHA256 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144 bzr-0.8.2.tar.gz 720152
diff --git a/dev-util/bzr/files/digest-bzr-0.8.2-r1 b/dev-util/bzr/files/digest-bzr-0.8.2-r1
deleted file mode 100644
index bddfa5c5c678..000000000000
--- a/dev-util/bzr/files/digest-bzr-0.8.2-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9bcfcc2a60156a5a74e247846ebe7473 bzr-0.8.2.tar.gz 720152
-RMD160 5cdbfa3f9a87fc1b999e1bef187f1e83fc7cb251 bzr-0.8.2.tar.gz 720152
-SHA256 81d982a6aa875b30e4c1ba2d1ade17b34f90fa533e815e3a744bc244745e3144 bzr-0.8.2.tar.gz 720152