clean up

Package-Manager: portage-2.1.9.40/cvs/Linux i686

9 files changed, 15 insertions, 405 deletions

diff --git a/dev-vcs/bzr-gtk/ChangeLog b/dev-vcs/bzr-gtk/ChangeLog
index 02c23a447ff0..f4316a62f105 100644
--- a/dev-vcs/bzr-gtk/ChangeLog
+++ b/dev-vcs/bzr-gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr-gtk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog,v 1.8 2011/01/22 16:29:38 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/ChangeLog,v 1.9 2011/02/25 22:33:58 fauli Exp $
+
+  25 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  -bzr-gtk-0.98.0.ebuild:
+  clean up
 
   22 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   bzr-gtk-0.99.0.ebuild:
diff --git a/dev-vcs/bzr-gtk/bzr-gtk-0.98.0.ebuild b/dev-vcs/bzr-gtk/bzr-gtk-0.98.0.ebuild
deleted file mode 100644
index ede59d9284a0..000000000000
--- a/dev-vcs/bzr-gtk/bzr-gtk-0.98.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-gtk/bzr-gtk-0.98.0.ebuild,v 1.4 2010/08/12 21:23:05 fauli Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_P="/${P/_rc/rc}"
-
-DESCRIPTION="A GTK+ interfaces to most Bazaar operations"
-HOMEPAGE="http://bazaar-vcs.org/bzr-gtk"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gconf gnome-keyring gpg +sourceview libnotify nautilus"
-
-DEPEND=">=dev-vcs/bzr-1.6_rc1
-	<dev-vcs/bzr-2.2.0
-	>=dev-python/pygtk-2.8
-	nautilus? ( dev-python/nautilus-python )
-	>=dev-python/pycairo-1.0"
-RDEPEND="${DEPEND}
-	gnome-keyring? ( dev-python/gnome-keyring-python )
-	gpg? ( app-crypt/seahorse )
-	sourceview? (
-		dev-python/pygtksourceview
-		gconf? ( dev-python/gconf-python )
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-#TODO: src_test
-
-src_install() {
-	distutils_src_install
-
-	if use libnotify; then
-		insinto /etc/xdg/autostart
-		doins bzr-notify.desktop
-	fi
-}
diff --git a/dev-vcs/bzr-svn/ChangeLog b/dev-vcs/bzr-svn/ChangeLog
index a45b07f74084..2e824a2990f4 100644
--- a/dev-vcs/bzr-svn/ChangeLog
+++ b/dev-vcs/bzr-svn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr-svn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-svn/ChangeLog,v 1.8 2011/01/22 16:26:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-svn/ChangeLog,v 1.9 2011/02/25 22:31:12 fauli Exp $
+
+  25 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  -bzr-svn-1.0.1.ebuild, -bzr-svn-1.0.3.ebuild:
+  clean up
 
   22 Jan 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> bzr-svn-1.0.4.ebuild:
   x86 stable wrt bug #346985
diff --git a/dev-vcs/bzr-svn/bzr-svn-1.0.1.ebuild b/dev-vcs/bzr-svn/bzr-svn-1.0.1.ebuild
deleted file mode 100644
index f0812b7541dd..000000000000
--- a/dev-vcs/bzr-svn/bzr-svn-1.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-svn/bzr-svn-1.0.1.ebuild,v 1.3 2010/11/15 15:54:22 arfrever Exp $
-
-EAPI=2
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-
-inherit distutils
-
-MY_P=${P/_rc/~rc}
-
-DESCRIPTION="Bazaar plugin that adds support for foreign Subversion repositories."
-HOMEPAGE="http://bazaar-vcs.org/BzrForeignBranches/Subversion"
-SRC_URI="http://samba.org/~jelmer/bzr/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-# Packager: check compatible bzr versions via
-# `grep bzr_compatible_versions info.py`, and minimum subvertpy version
-# via `grep subvertpy_minimum_version info.py`.
-
-DEPEND=">=dev-vcs/bzr-1.16
-	>=dev-python/subvertpy-0.6.1"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS FAQ HACKING NEWS README TODO UPGRADING mapping.txt specs/*"
diff --git a/dev-vcs/bzr-svn/bzr-svn-1.0.3.ebuild b/dev-vcs/bzr-svn/bzr-svn-1.0.3.ebuild
deleted file mode 100644
index d39786f19947..000000000000
--- a/dev-vcs/bzr-svn/bzr-svn-1.0.3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-svn/bzr-svn-1.0.3.ebuild,v 1.2 2010/11/15 15:54:22 arfrever Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="sqlite"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
-
-inherit distutils
-
-MY_P=${P/_rc/~rc}
-
-DESCRIPTION="Bazaar plugin that adds support for foreign Subversion repositories."
-HOMEPAGE="http://bazaar-vcs.org/BzrForeignBranches/Subversion"
-SRC_URI="http://samba.org/~jelmer/bzr/${MY_P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-# As long as https://bugs.launchpad.net/bzr-svn/+bug/526485 is unfixed
-RESTRICT=test
-
-# Packager: check compatible bzr versions via
-# `grep bzr_compatible_versions info.py`, and minimum subvertpy version
-# via `grep subvertpy_minimum_version info.py`.
-
-CDEPEND=">=dev-vcs/bzr-1.16
-	>=dev-python/subvertpy-0.6.1"
-DEPEND="${CDEPEND}
-	test? ( !dev-vcs/bzr-rebase )"
-RDEPEND="${CDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="AUTHORS FAQ HACKING NEWS README TODO UPGRADING mapping.txt specs/*"
diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index eb9c0d132eee..a980a5222b37 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.22 2011/02/25 20:33:11 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.23 2011/02/25 22:28:08 fauli Exp $
+
+  25 Feb 2011; Christian Faulhammer <fauli@gentoo.org>
+  -files/bzr-1.8-no-pyrex.patch, -bzr-2.0.1.ebuild, -bzr-2.2.1.ebuild:
+  clean up
 
   25 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org> bzr-2.2.2-r1.ebuild:
   ppc/ppc64 stable wrt #346985
diff --git a/dev-vcs/bzr/bzr-2.0.1.ebuild b/dev-vcs/bzr/bzr-2.0.1.ebuild
deleted file mode 100644
index 9d05902d9a56..000000000000
--- a/dev-vcs/bzr/bzr-2.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.2 2010/07/10 18:54:19 arfrever Exp $
-
-EAPI=1
-
-PYTHON_DEPEND="2"
-
-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.2.1.ebuild b/dev-vcs/bzr/bzr-2.2.1.ebuild
deleted file mode 100644
index 76c22f54569a..000000000000
--- a/dev-vcs/bzr/bzr-2.2.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# 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.2.1.ebuild,v 1.1 2010/10/10 14:41:55 fauli Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-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 ~ppc-macos ~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.7[xml] dev-lang/python:2.6[xml] dev-lang/python:2.5[xml] dev-python/celementtree )
-	curl? ( dev-python/pycurl )
-	sftp? ( dev-python/paramiko )"
-
-DEPEND="emacs? ( virtual/emacs )
-	test? (
-		${RDEPEND}
-		dev-python/medusa
-		dev-python/subunit
-		dev-python/testtools
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="doc/*.txt"
-PYTHON_MODNAME="bzrlib"
-SITEFILE="71bzr-gentoo.el"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Don't regenerate .c files from .pyx when pyrex is found.
-	epatch "${FILESDIR}/${PN}-2.2.0-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_test() {
-	# Some tests expect the usual pyc compiling behaviour.
-	python_enable_pyc
-
-	# 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+=")"
-	if [[ -n ${skip_tests} ]]; then
-		einfo "Skipping tests known to fail: ${skip_tests}"
-	fi
-
-	testing() {
-		LC_ALL="C" "$(PYTHON -A)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
-	}
-	python_execute_function testing
-
-	# Just to make sure we don't hit any errors on later stages.
-	python_disable_pyc
-}
-
-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
-
-	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
-}
diff --git a/dev-vcs/bzr/files/bzr-1.8-no-pyrex.patch b/dev-vcs/bzr/files/bzr-1.8-no-pyrex.patch
deleted file mode 100644
index 92d097735a31..000000000000
--- a/dev-vcs/bzr/files/bzr-1.8-no-pyrex.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-=== 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):
- 
-