version bump and clean up

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

4 files changed, 11 insertions, 150 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index a3e7b4bb39e9..ce74023b9f5f 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2011/05/29 10:03:00 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.28 2011/07/17 11:23:29 fauli Exp $
+
+*bzr-2.3.4 (17 Jul 2011)
+
+  17 Jul 2011; Christian Faulhammer <fauli@gentoo.org> -bzr-2.3.0.ebuild,
+  -bzr-2.3.1.ebuild, +bzr-2.3.4.ebuild:
+  version bump and clean up
 
 *bzr-2.3.3 (29 May 2011)
 
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 2bf4fabad342..9f5e67cfb659 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 71bzr-gentoo.el 124 RMD160 d85713f80f9be8685bf56979626003f46ebbc22f SHA1 150e54685444e444e2328bb5cb9dbb1c68c066e0 SHA256 8033a55433689ba25acd502865086600d1a03158a88f4a596fae0e7d3d953454
 AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
 AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f1 SHA1 5608d6a2e2215453523441ff9890e11aebbc289e SHA256 8bff8a500f96bbade348a11fdc70d00f9166774b8cc0a08c8d8dd3e33326bbcc
@@ -8,20 +5,11 @@ AUX bzr-2.2.0-no-pyrex-citon.patch 1191 RMD160 5096704ac9547fe44e40b954d78014118
 AUX bzr-2.2.2-python-2.7.patch 1442 RMD160 b3abc70fe110c395f0fe9ea048dd2a3601709254 SHA1 d1ca99405c5d55c62355f947ff9a897985d4f55c SHA256 0595c35539d1845ed21466aeab3115cecb07ee3e424d39ad2683267adc67d24f
 DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
 DIST bzr-2.2.4.tar.gz 6900607 RMD160 57b5daa0ac94d727dee003a66fabea251d49324a SHA1 f63b93bde9372acd792e23c598789ea4c8c35577 SHA256 3ba84414cce4435dd34f4f1d7c94691587e6aa0b6677c361af17d74fb90a657e
-DIST bzr-2.3.0.tar.gz 7025246 RMD160 ce7d70c683f6b6186e26e73a856648846ab6b90c SHA1 42a5b270e75a57883ead3cee9e623e087f16afd8 SHA256 579c21e0d29e6bac80e53bef9f220cae7675407208c5ca967302f31370d0faee
-DIST bzr-2.3.1.tar.gz 7026390 RMD160 f284b61ae93e7db6a34107a309005ebb2be7f55f SHA1 49b9dfb5a01ffd87a120f8a7abf4833a482ba245 SHA256 a35ca8e0118ee21ff226cb7f3bb167f56e8eccd3d4b5e9d94266e34778207d1e
 DIST bzr-2.3.3.tar.gz 7034416 RMD160 e13b1a8a541484fdaf7ee90550c2dca13daa6009 SHA1 4c1a0a75243a9c3717e7e7147770636c577826fc SHA256 2de6b6c2b799701f70796c8467f37d26b48993d303b528a5bb6b79b9237025a4
+DIST bzr-2.3.4.tar.gz 7036541 RMD160 f9aca792a406d647c5252d8b4e3ca690df9942aa SHA1 fd4d28abe41835c2c327b21972edb4533fee0ae0 SHA256 336f8cdcaf5539af2600c0412a036cb70578cc641c076bd97bc2d85d44502094
 EBUILD bzr-2.2.2-r1.ebuild 4011 RMD160 ac8c527599dd46d6e674ee53a492820d48859472 SHA1 20c133f5bc8adf9252dce4dcce44c899224bad34 SHA256 c2c849efa1229c2cdb0e5f0468a6bec3321a6038ce37782bb87810538316859f
 EBUILD bzr-2.2.4.ebuild 4016 RMD160 c5d119899ad47638ee425444da220406665455e4 SHA1 e087b5131910fe8d849487c1c13cd97cf86ba214 SHA256 e1647eb38d0c03c3f0bd6185b1f63516bb230abbc66cb4bcc3b0c6ec43eb75a1
-EBUILD bzr-2.3.0.ebuild 3709 RMD160 923c4972af7f74576983f2511c206eebb3625ccf SHA1 c534e65ad7580a5ea6e9ce1b67df8d9c72d8ee7c SHA256 14a5089ff9d4d6eaebd818486ea10aff80027fa07d9c5e04ef109f294ce07026
-EBUILD bzr-2.3.1.ebuild 3709 RMD160 10db0f24e950dd9f8d74034409c91abc51878955 SHA1 93485e179ba95405b19019436b6045d4d641ffc7 SHA256 f73624c73a1212771122939bc1a5d4792ffe02b6f46064fd7af84fb1fe8ffd95
 EBUILD bzr-2.3.3.ebuild 3709 RMD160 b88b7f0a743e59e153362dfaf7720f3f77724864 SHA1 0743d9040eb05c815cafb3f02877ed6c1a9152d5 SHA256 0e4596da93ba3d13b2f12f0934b59f9c4cfbecf6a49293110b5f24281058023c
-MISC ChangeLog 22463 RMD160 55d5efeec8e78fd53a7875ee27032fbdecab2a34 SHA1 366fca9c607f762ee7b5c8bd70ada89b640df42a SHA256 f31d81b5cc3719e555e61d63e3527c29ca7ce6fce3ab7e9378bed6f7e7b163a7
+EBUILD bzr-2.3.4.ebuild 3709 RMD160 cb1bce9eca49eb5eb8e5d7483cbe16af0ad9cfb4 SHA1 6f8ae0c0d7309aa4389765c551145b44e9e81467 SHA256 5a0e67d1a0aa5d5a0b408349131747b7a3a2567e4eba060f08dcbdaa536d0e0d
+MISC ChangeLog 22632 RMD160 f38c73b76839f93b9ef4a429d276c5afc6b4a501 SHA1 8ec93c06b54e3f93f5846d79a5388436b7fd3db6 SHA256 4ad2f4ffd5f4273d4e41dc4051740e315d860b720ca6fa9026668fb15e0d58cc
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk3iGeMACgkQNQqtfCuFneNofQCggtQVtRS2MaAEUTbXG/HwxCTv
-L3kAoIF4w8FwfYY3Og+bVuKXg2rwSLTb
-=YJdK
------END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.3.1.ebuild b/dev-vcs/bzr/bzr-2.3.1.ebuild
deleted file mode 100644
index c653012dfd73..000000000000
--- a/dev-vcs/bzr/bzr-2.3.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.3.1.ebuild,v 1.1 2011/03/22 20:19:17 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/656170 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
-	# Has to be backported, tests are restricted anyway
-#	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 -2)" 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/bzr-2.3.0.ebuild b/dev-vcs/bzr/bzr-2.3.4.ebuild
index f11f2b9bcde4..7e286f63b588 100644
--- a/dev-vcs/bzr/bzr-2.3.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.3.0.ebuild,v 1.1 2011/02/11 23:21:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.3.4.ebuild,v 1.1 2011/07/17 11:23:29 fauli Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"