version bump

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

3 files changed, 146 insertions, 6 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index d62d007b3823..1d84c3682d70 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.19 2011/02/05 22:47:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.20 2011/02/11 23:21:41 fauli Exp $
+
+*bzr-2.3.0 (11 Feb 2011)
+
+  11 Feb 2011; Christian Faulhammer <fauli@gentoo.org> +bzr-2.3.0.ebuild:
+  version bump
 
   05 Feb 2011; Markus Meier <maekke@gentoo.org> bzr-2.2.2-r1.ebuild:
   arm stable, bug #346985
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 80f9e17f694c..d981ba7b3d7b 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -10,15 +10,17 @@ AUX bzr-2.2.2-python-2.7.patch 1442 RMD160 b3abc70fe110c395f0fe9ea048dd2a3601709
 DIST bzr-2.0.1.tar.gz 6101477 RMD160 a48492a27942f1001c1270fc8bb974135328c4b5 SHA1 e19c05e052290746de54f65254e056e39ba5e018 SHA256 3438bd7b5d07486d85a63cf47a26f3532ef7fb4019770ca48faddfa9875e06c9
 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
+DIST bzr-2.3.0.tar.gz 7025246 RMD160 ce7d70c683f6b6186e26e73a856648846ab6b90c SHA1 42a5b270e75a57883ead3cee9e623e087f16afd8 SHA256 579c21e0d29e6bac80e53bef9f220cae7675407208c5ca967302f31370d0faee
 EBUILD bzr-2.0.1.ebuild 3546 RMD160 f718e751e157f5b53ca82ac429aba09c21374f8f SHA1 68154bfbc75413d3a4b7df24a727160c83f3b72e SHA256 b94c608d42a995f790a66158e1c9b3332da20bc96fd896a107ba29ffe9fbabd5
 EBUILD bzr-2.2.1.ebuild 3654 RMD160 8636e0334980f672f3ae4cac2ff70f6e3371ace0 SHA1 2b0f5e1b7cc739afc90cc4c138ed3c75811899ac SHA256 49d9d048efd46a03021bcea5226ed7c65258a561e256aea018e9e5fa42b3e12f
 EBUILD bzr-2.2.2-r1.ebuild 4013 RMD160 9bebd47e16ccf8bd2c387e76c9cf980b02b4ddc5 SHA1 135c8120023c35701b5b70cc6767a9efdec18c87 SHA256 d51056100968c332246a96ee916387d33d48ee4c1efa9ef19126df51505ca841
-MISC ChangeLog 21517 RMD160 433f7902bdb2d1db602be35953dee48a8dd0f391 SHA1 127a7b1aa628ec298d08eebc34ebb3fe1fc1152f SHA256 0100f2291698d2bba170a48f2e20795e75508d9d2722d369ad76440fdf2a3928
+EBUILD bzr-2.3.0.ebuild 3709 RMD160 923c4972af7f74576983f2511c206eebb3625ccf SHA1 c534e65ad7580a5ea6e9ce1b67df8d9c72d8ee7c SHA256 14a5089ff9d4d6eaebd818486ea10aff80027fa07d9c5e04ef109f294ce07026
+MISC ChangeLog 21632 RMD160 eb2f30677793c87f60288f3894aa0b23ab872660 SHA1 2a0da95a1e1738eccb868baac6b1932d60e97963 SHA256 a02e09fc26e056ba6fd975633a25c538680435fce05703e78811cab91ffe972b
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk1N09cACgkQkKaRLQcq0GKABACeOGWwlDSRhpQN/AK9DwHcKS7j
-yH0AnjSqIkRKoSiokhjM17Obq8L//dyz
-=E/iH
+iEYEARECAAYFAk1VxJAACgkQNQqtfCuFnePNGgCggzDeOIJ8b5srhh3J5/GwfVlC
+g18AnAv0MafgNICUgSCQ8LfAVKbVikJU
+=hbgA
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.3.0.ebuild b/dev-vcs/bzr/bzr-2.3.0.ebuild
new file mode 100644
index 000000000000..f11f2b9bcde4
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.3.0.ebuild
@@ -0,0 +1,133 @@
+# 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 $
+
+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
+}