clean up

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

4 files changed, 9 insertions, 265 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index fd1ba40ea383..5065a104967b 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.11 2010/11/27 10:48:28 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.12 2010/11/27 10:53:02 fauli Exp $
+
+  27 Nov 2010; Christian Faulhammer <fauli@gentoo.org> -bzr-2.0.4.ebuild,
+  -bzr-2.2.0.ebuild:
+  clean up
 
 *bzr-2.2.2 (27 Nov 2010)
 
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 0fcfd9961e8b..dc6c4d52637c 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -7,21 +7,17 @@ AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f
 AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 SHA1 a118057a6f34b9ff2ddc90f01945820d87a983f3 SHA256 f213cd8a2f0444dd130a13e65ede34cade2da33b2ad739c8f4fd48e912ed7ebb
 AUX bzr-2.2.0-no-pyrex-citon.patch 1191 RMD160 5096704ac9547fe44e40b954d780141186de70d2 SHA1 1eb07ce2b3847c3a792c603241d209da3b1fffe2 SHA256 e24852b7ef0f698d3c870b71ba615a9452c8a62c6a5e0ac7328e074d4d4adef2
 DIST bzr-2.0.1.tar.gz 6101477 RMD160 a48492a27942f1001c1270fc8bb974135328c4b5 SHA1 e19c05e052290746de54f65254e056e39ba5e018 SHA256 3438bd7b5d07486d85a63cf47a26f3532ef7fb4019770ca48faddfa9875e06c9
-DIST bzr-2.0.4.tar.gz 6613732 RMD160 e6159191e384ccc28e21bf30f1b5eb2937759310 SHA1 5f2c8558aceef2a790b1e65b1fa48577582446cd SHA256 6f601e4103b88cf3022add33e35d94408adc69fd9604a79e528c7bf036a1f72f
-DIST bzr-2.2.0.tar.gz 6888769 RMD160 65940081bcb7619b3e173c89c32cb9454b23371e SHA1 1cf1252df3ba31b2133a91d781db03ff832e14a6 SHA256 64cd6c23097884e40686adc7f0ad4a8200e2292bdc5e0caba3563b6f5c32bacf
 DIST bzr-2.2.1.tar.gz 6898362 RMD160 da29aeaa63b7b172e6cfddfed2c57bf054b08b66 SHA1 31ca3be090f2d0953a74dd83f3682099d5d28782 SHA256 46804359f6e7012f0e0489f5bebd5bdb12557e7a2acac5790fb315d5ed82b5d0
 DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
 EBUILD bzr-2.0.1.ebuild 3546 RMD160 f718e751e157f5b53ca82ac429aba09c21374f8f SHA1 68154bfbc75413d3a4b7df24a727160c83f3b72e SHA256 b94c608d42a995f790a66158e1c9b3332da20bc96fd896a107ba29ffe9fbabd5
-EBUILD bzr-2.0.4.ebuild 3625 RMD160 d6a5e5db333bc1ab56ed213f6d11b33d8d5a7a4b SHA1 21fb78d56fd81a02a2e7ebcdbdeb43fcf46d833f SHA256 f94dc99f6e448ca39ffe26addf77cc345e6e663344afac4a1a22c763f3828ae3
-EBUILD bzr-2.2.0.ebuild 3654 RMD160 319d925e9c62345dd5a4d91fdfd5010eed977697 SHA1 d5073a02cf60155556ebfbecd0d0073c575ad8c6 SHA256 fb1dcd1a761691c7563c70154b0802baa442acc1bea6ef7629e7f3681b90b7d7
 EBUILD bzr-2.2.1.ebuild 3654 RMD160 8636e0334980f672f3ae4cac2ff70f6e3371ace0 SHA1 2b0f5e1b7cc739afc90cc4c138ed3c75811899ac SHA256 49d9d048efd46a03021bcea5226ed7c65258a561e256aea018e9e5fa42b3e12f
 EBUILD bzr-2.2.2.ebuild 3744 RMD160 2b4c8f1193b6d11d4fcfefe74df62bbd09363414 SHA1 b951c633fcd0cf96c1e7d5c079befc344c4dcc52 SHA256 2d9d571e4620d7b66be63f880715abba1b1bb7231e5c253a77f0860b50a71266
-MISC ChangeLog 20444 RMD160 db0cf641fb8be507eca95f682de5ccc26fde865a SHA1 79b888b068ec69907e9d28320d88913fd614bf71 SHA256 c1c30a6e9c1cd24fee0148cadb4badff93f124c04adc66d4d55129add10f65a2
+MISC ChangeLog 20551 RMD160 effc68d688f345eb180ef7d60121aa3cdbf41644 SHA1 92f7aaba3769386c60cf22e40fdac5e17a2fe975 SHA256 ab2d66e9da8d713c5056f38a8240e2cc114a2d4b7821b2648d28e1d1c6a77101
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzw4l4ACgkQNQqtfCuFneONBQCeJfZSVrDNGbtv8C4yMr2HNXx4
-JGYAn1b46BxCQWUh/klpgbbKQ9mvdOFU
-=xQPS
+iEYEARECAAYFAkzw42YACgkQNQqtfCuFneNBtACfWjfh+7qYzXDGxLF42u+2b5nd
+dU8An2Et6VVffI7q9gbLnjyDyoBWrts+
+=I2BT
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.0.4.ebuild b/dev-vcs/bzr/bzr-2.0.4.ebuild
deleted file mode 100644
index 601549f2d8a8..000000000000
--- a/dev-vcs/bzr/bzr-2.0.4.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.4.ebuild,v 1.1 2010/03/05 09:33:53 fauli Exp $
-
-EAPI=3
-
-PYTHON_DEPEND=2
-
-inherit bash-completion distutils 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 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-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_prepare() {
-	distutils_src_prepare
-
-	# 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 "${EPREFIX}"/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 "${ED}${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.0.ebuild b/dev-vcs/bzr/bzr-2.2.0.ebuild
deleted file mode 100644
index 9fcc2a956ae8..000000000000
--- a/dev-vcs/bzr/bzr-2.2.0.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.0.ebuild,v 1.1 2010/08/10 12:28:59 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
-}