version bump

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

3 files changed, 145 insertions, 6 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 5110ef959f82..8a4d9c119f4f 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2010/08/10 12:28:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.9 2010/10/10 14:41:55 fauli Exp $
+
+*bzr-2.2.1 (10 Oct 2010)
+
+  10 Oct 2010; Christian Faulhammer <fauli@gentoo.org> +bzr-2.2.1.ebuild:
+  version bump
 
 *bzr-2.2.0 (10 Aug 2010)
 
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 7e8c5f9de3b3..0f703d291371 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -12,17 +12,19 @@ DIST bzr-2.0.4.tar.gz 6613732 RMD160 e6159191e384ccc28e21bf30f1b5eb2937759310 SH
 DIST bzr-2.1.1.tar.gz 6786377 RMD160 a1c6e91907954d2bbaa117eafccaa69d70d0c337 SHA1 f8628ef1a9e9b7a397a8d673cef677e5449f6e95 SHA256 b87d2974d0f6dc58701958ded82d56b45d566af8eedf2d8580f3c887cd86d651
 DIST bzr-2.1.2.tar.gz 6824032 RMD160 1c31f50a8d6dda7cf475a76e6ba60aa2ab1705b2 SHA1 3e0335b2a9517ac3ec681e044b36c16969ef2c30 SHA256 340f8b708bc4515c34a1879d953924444deb3f275dabd92455d58854fb0a60f2
 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
 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.1.1.ebuild 3562 RMD160 17673681877a42f1639393f647df61c50ff685e5 SHA1 9e86fc53858f3b57cad5f18ed07c43aa9ccfa810 SHA256 d0dbd58807164c10de9e8d6de2765d1ef5992faab45cee6a54ea4bd0e07640b8
 EBUILD bzr-2.1.2.ebuild 3720 RMD160 86cce20ae3ee6f3e4c9347dc739976a10d2bb24c SHA1 e3cdb598580c1aa2223cac23db726f330b36b325 SHA256 0073320d798b52e58497ad403a82f46f2db3464bcfae317f6c5302250569aff0
 EBUILD bzr-2.2.0.ebuild 3654 RMD160 319d925e9c62345dd5a4d91fdfd5010eed977697 SHA1 d5073a02cf60155556ebfbecd0d0073c575ad8c6 SHA256 fb1dcd1a761691c7563c70154b0802baa442acc1bea6ef7629e7f3681b90b7d7
-MISC ChangeLog 20065 RMD160 949e81ffd79ab83fb7d39211185e4e104d49cc1c SHA1 fef0c571723011270002a22bbef35fd6b339c13c SHA256 b3acb2df7fe773060f4f50864a12fdb254270e93714404d4aa3996220c4fda74
+EBUILD bzr-2.2.1.ebuild 3654 RMD160 8636e0334980f672f3ae4cac2ff70f6e3371ace0 SHA1 2b0f5e1b7cc739afc90cc4c138ed3c75811899ac SHA256 49d9d048efd46a03021bcea5226ed7c65258a561e256aea018e9e5fa42b3e12f
+MISC ChangeLog 20181 RMD160 5dd5555a2dc6d2a83e801b6fcdbda9044dcaab51 SHA1 df6d38bef85f466679f4a0044affd0061679c96b SHA256 c9abd279ae1be07123b64610d5dacf78b0ada66587981faff018969f729b733a
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxhRswACgkQNQqtfCuFneOM5wCfVwZGiisyDMGYqlFgqskhBgLC
-uk0AnRKMxFCC+MYZyhJDySgV02sWsejj
-=H2AI
+iEYEARECAAYFAkyx0SQACgkQNQqtfCuFneOQLACePB094wXswnFEP2slmmWTihE8
+oisAoJsj+GUC2PZ0qSLVS7CbW+gmHFUA
+=O1FE
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.2.1.ebuild b/dev-vcs/bzr/bzr-2.2.1.ebuild
new file mode 100644
index 000000000000..76c22f54569a
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.2.1.ebuild
@@ -0,0 +1,132 @@
+# 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
+}