clean up

(Portage version: 2.1.6.13/cvs/Linux i686)

8 files changed, 7 insertions, 734 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 1a17dcf9b076..85adff030192 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/bzr
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.103 2009/07/17 18:35:52 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.104 2009/07/20 21:37:41 fauli Exp $
+
+  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
diff --git a/dev-util/bzr/bzr-1.10.ebuild b/dev-util/bzr/bzr-1.10.ebuild
deleted file mode 100644
index 6ee976dcb19e..000000000000
--- a/dev-util/bzr/bzr-1.10.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.10.ebuild,v 1.1 2008/12/08 14:50:56 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 doc 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}-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
-	# Some tests expect the usual pyc compiling behaviour.
-	python_enable_pyc
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-	# Just to make sure we don't hit any errors on later stages.
-	python_disable_pyc
-}
diff --git a/dev-util/bzr/bzr-1.11.ebuild b/dev-util/bzr/bzr-1.11.ebuild
deleted file mode 100644
index 951bcdf8ccd1..000000000000
--- a/dev-util/bzr/bzr-1.11.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.11.ebuild,v 1.1 2009/01/20 11:58:51 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 doc 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}-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="("
-	skip_tests+="bzrlib.tests.test_bzrdir.ChrootedTests|"
-	skip_tests+="test_http.SmartHTTPTunnellingTest.test_bulk_data"
-	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-util/bzr/bzr-1.12.ebuild b/dev-util/bzr/bzr-1.12.ebuild
deleted file mode 100644
index 81abf10fb56d..000000000000
--- a/dev-util/bzr/bzr-1.12.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.12.ebuild,v 1.3 2009/02/20 19:02:42 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="~amd64 ~ia64 ~ppc ~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="("
-	skip_tests+="bzrlib.tests.test_bzrdir.ChrootedTests|"
-	skip_tests+="test_http.SmartHTTPTunnellingTest.test_bulk_data"
-	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-util/bzr/bzr-1.13.2.ebuild b/dev-util/bzr/bzr-1.13.2.ebuild
deleted file mode 100644
index 66c6c41513f1..000000000000
--- a/dev-util/bzr/bzr-1.13.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.13.2.ebuild,v 1.3 2009/06/01 13:51:50 maekke 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="amd64 ~ia64 ~ppc ~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="("
-	#https://bugs.launchpad.net/bzr/+bug/306264
-	skip_tests+="test_http.TestWallServer.test_http_*|"
-	skip_tests+="blackbox.test_too_much.SFTPTestsRelative.test_*|"
-	#skip_tests+="blackbox.test_too_much.SFTPTestsRelative.test_check|"
-	#https://bugs.launchpad.net/bzr/+bug/341648
-	skip_tests+="test_osutils.TestWalkDirs.test_walkdirs_os_error"
-	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-util/bzr/bzr-1.14.1.ebuild b/dev-util/bzr/bzr-1.14.1.ebuild
deleted file mode 100644
index ef4f2e14b8a9..000000000000
--- a/dev-util/bzr/bzr-1.14.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.14.1.ebuild,v 1.1 2009/05/02 10:10:37 pva 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="~amd64 ~ia64 ~ppc ~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="("
-	# https://bugs.launchpad.net/bzr/+bug/306264
-	skip_tests+="test_http.SmartHTTPTunnellingTest.test_bulk_data|"
-	skip_tests+="test_http.TestWallServer.test_http_*|"
-	skip_tests+="blackbox.test_too_much.SFTPTestsRelative.test_*|"
-	#https://bugs.launchpad.net/bzr/+bug/341648
-	skip_tests+="test_osutils.TestWalkDirs.test_walkdirs_os_error"
-	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-util/bzr/bzr-1.9.ebuild b/dev-util/bzr/bzr-1.9.ebuild
deleted file mode 100644
index 0fd948b8693a..000000000000
--- a/dev-util/bzr/bzr-1.9.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.9.ebuild,v 1.5 2009/01/03 15:06:33 nixnut 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 doc 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}-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() {
-	# Some tests expect the usual pyc compiling behaviour.
-	python_enable_pyc
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-	# Just to make sure we don't hit any errors on later stages.
-	python_disable_pyc
-}
diff --git a/dev-util/bzr/files/bzr-0.92-no-pyrex.patch b/dev-util/bzr/files/bzr-0.92-no-pyrex.patch
deleted file mode 100644
index ff9d6dbf2f92..000000000000
--- a/dev-util/bzr/files/bzr-0.92-no-pyrex.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- setup.py	2007-11-09 15:19:32.000000000 +0200
-+++ setup.py	2007-11-14 18:26:00.000000000 +0200
-@@ -154,21 +154,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
--
-+have_pyrex = False
-+from distutils.command.build_ext import build_ext
- 
- class build_ext_if_possible(build_ext):
-