Version bump, removed old.

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

8 files changed, 10 insertions, 407 deletions

diff --git a/dev-util/bzr/ChangeLog b/dev-util/bzr/ChangeLog
index 680986165e95..7bc347d75384 100644
--- a/dev-util/bzr/ChangeLog
+++ b/dev-util/bzr/ChangeLog
@@ -1,6 +1,14 @@
 # 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.56 2008/08/23 17:13:05 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/ChangeLog,v 1.57 2008/08/25 23:10:29 pva Exp $
+
+*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
diff --git a/dev-util/bzr/bzr-0.17.ebuild b/dev-util/bzr/bzr-0.17.ebuild
deleted file mode 100644
index ff86d1687d57..000000000000
--- a/dev-util/bzr/bzr-0.17.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-0.17.ebuild,v 1.3 2007/07/10 23:25:54 jokey Exp $
-
-inherit distutils bash-completion elisp-common eutils
-
-MY_P=${P/_rc/rc}
-S=${WORKDIR}/${MY_P}
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc x86 ~x86-fbsd"
-IUSE="curl emacs test"
-
-python_rdep="dev-python/celementtree
-	>=dev-python/paramiko-1.5
-	curl? ( dev-python/pycurl )"
-DEPEND=">=dev-lang/python-2.4
-	emacs? ( virtual/emacs )
-	test? (
-		$python_rdep
-		dev-python/medusa
-	)"
-RDEPEND=">=dev-lang/python-2.4
-	$python_rdep"
-
-PYTHON_MODNAME="bzrlib"
-
-DOCS="doc/*.txt"
-
-# disable until bug #173301 is solved
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Install the manpage in /usr/share/man instead of /usr/man
-	epatch "${FILESDIR}/${PN}-0.16-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
-	docinto developers
-	dodoc doc/developers/*
-	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
-	use emacs && elisp-site-regen
-}
-
-src_test() {
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/bzr-1.1.ebuild b/dev-util/bzr/bzr-1.1.ebuild
deleted file mode 100644
index 77a1d2b6c867..000000000000
--- a/dev-util/bzr/bzr-1.1.ebuild
+++ /dev/null
@@ -1,101 +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.1.ebuild,v 1.2 2008/03/24 08:52:49 opfer Exp $
-
-NEED_PYTHON=2.4
-
-inherit distutils bash-completion elisp-common eutils
-
-MY_P=${P/_rc/rc}
-
-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"
-
-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/*
-	docinto user-guide
-	dodoc doc/en/user-guide/*
-	docinto user-reference
-	dodoc doc/en/user-reference/*
-	docinto mini-tutorial
-	dodoc doc/en/mini-tutorial/*
-
-	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() {
-	"${python}" bzr --no-plugins selftest || die "bzr selftest failed"
-}
diff --git a/dev-util/bzr/bzr-1.3.ebuild b/dev-util/bzr/bzr-1.3.ebuild
deleted file mode 100644
index 57e12501fc3f..000000000000
--- a/dev-util/bzr/bzr-1.3.ebuild
+++ /dev/null
@@ -1,105 +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.3.ebuild,v 1.3 2008/05/05 03:29:27 tester Exp $
-
-NEED_PYTHON=2.4
-
-inherit distutils bash-completion elisp-common eutils
-
-MY_P=${P/_rc/rc}
-
-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"
-
-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/*
-	docinto user-guide
-	dodoc doc/en/user-guide/*
-	docinto user-reference
-	dodoc doc/en/user-reference/*
-	docinto mini-tutorial
-	dodoc doc/en/mini-tutorial/*
-
-	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
-}
diff --git a/dev-util/bzr/bzr-1.4.ebuild b/dev-util/bzr/bzr-1.4.ebuild
deleted file mode 100644
index 59479ab32839..000000000000
--- a/dev-util/bzr/bzr-1.4.ebuild
+++ /dev/null
@@ -1,103 +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.4.ebuild,v 1.1 2008/05/10 09:24:24 hawking Exp $
-
-NEED_PYTHON=2.4
-
-inherit distutils bash-completion elisp-common eutils
-
-MY_P=${P/_rc/rc}
-
-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"
-
-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
-}
diff --git a/dev-util/bzr/bzr-1.6_rc5.ebuild b/dev-util/bzr/bzr-1.6.ebuild
index 6c2b3685fd2e..20f448a566b8 100644
--- a/dev-util/bzr/bzr-1.6_rc5.ebuild
+++ b/dev-util/bzr/bzr-1.6.ebuild
@@ -1,6 +1,6 @@
 # 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_rc5.ebuild,v 1.1 2008/08/23 07:06:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bzr/bzr-1.6.ebuild,v 1.1 2008/08/25 23:10:29 pva Exp $
 
 NEED_PYTHON=2.4
 
diff --git a/dev-util/bzr/files/70bzr-gentoo.el b/dev-util/bzr/files/70bzr-gentoo.el
deleted file mode 100644
index 0f31c8d0dedc..000000000000
--- a/dev-util/bzr/files/70bzr-gentoo.el
+++ /dev/null
@@ -1,3 +0,0 @@
-;;; bzr site-lisp configuration
-
-(load "bzr-mode")
diff --git a/dev-util/bzr/files/bzr-0.16-fix-manpage-location.patch b/dev-util/bzr/files/bzr-0.16-fix-manpage-location.patch
deleted file mode 100644
index ed80ede4c89e..000000000000
--- a/dev-util/bzr/files/bzr-0.16-fix-manpage-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'setup.py'
---- setup.py	2007-03-11 23:34:27 +0000
-+++ setup.py	2007-05-10 23:50:31 +0000
-@@ -236,7 +236,7 @@
- else:
-     # std setup
-     ARGS = {'scripts': ['bzr'],
--            'data_files': [('man/man1', ['bzr.1'])],
-+            'data_files': [('share/man/man1', ['bzr.1'])],
-             'cmdclass': command_classes,
-             'ext_modules': ext_modules,
-            }
-