version bump

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

4 files changed, 173 insertions, 6 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index 85dfe8cd04c1..de2629219c32 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for dev-util/bzr
+# 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.1 2010/03/05 09:33:53 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.2 2010/03/25 14:58:21 fauli Exp $
+
+*bzr-2.1.1 (25 Mar 2010)
+
+  25 Mar 2010; Christian Faulhammer <fauli@gentoo.org> +bzr-2.1.1.ebuild,
+  +files/bzr-2.1.1-no-pyrex-citon.patch:
+  version bump
 
   03 Mar 2010; Christian Faulhammer <fauli@gentoo.org> bzr-2.1.0.ebuild:
   fix SRC_URI, thanks to Locke Shinseiko <Wizzleby AT gmail DOT com> in bug
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index f1951cb77f1a..efe4e8c5a811 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -6,18 +6,21 @@ AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d
 AUX bzr-0.90-tests-sgid.patch 607 RMD160 d40336d5c98fb777bdc1366b42ae4fb00e9d56f1 SHA1 5608d6a2e2215453523441ff9890e11aebbc289e SHA256 8bff8a500f96bbade348a11fdc70d00f9166774b8cc0a08c8d8dd3e33326bbcc
 AUX bzr-1.8-no-pyrex.patch 918 RMD160 36de25bb174bc66b512bd6b25a6cfd8a2cbb1ca3 SHA1 a118057a6f34b9ff2ddc90f01945820d87a983f3 SHA256 f213cd8a2f0444dd130a13e65ede34cade2da33b2ad739c8f4fd48e912ed7ebb
 AUX bzr-2.1-no-pyrex-citon.patch 1123 RMD160 54a57f24f76e555cb77a39c86d6702b3a2ee86ee SHA1 d769bb2f561234e4cf6106b470567537de48daed SHA256 8304a5078ebcfbcdbafdf0e84119b46a289940b6748bff61b158a35d03211157
+AUX bzr-2.1.1-no-pyrex-citon.patch 1186 RMD160 253ccf06842556b6822bc6cc02c3d085fd09564a SHA1 45e49cba28a49ef56b15971675f57c25788fd37f SHA256 b796062c0e39a173cac37e11c0133f201eaf60d7ae25954aad91fc58198b3fe5
 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.1.0.tar.gz 6787494 RMD160 c54ca16aca7811fc34b71ff852199afab3f19519 SHA1 cc7137c657d7918e833e64d77a267f8162d3a05d SHA256 7a1e9353eeabdc0f7ff540fb095994a93a6022e03063c9750faaf2d459277125
+DIST bzr-2.1.1.tar.gz 6786377 RMD160 a1c6e91907954d2bbaa117eafccaa69d70d0c337 SHA1 f8628ef1a9e9b7a397a8d673cef677e5449f6e95 SHA256 b87d2974d0f6dc58701958ded82d56b45d566af8eedf2d8580f3c887cd86d651
 EBUILD bzr-2.0.1.ebuild 3541 RMD160 b0f6a41a746e19da4c5f515ec4db17ac371010a9 SHA1 8c5906bc4468f17a7c7c626ef000b5256e052d4a SHA256 1202c56c00e1b804fccee4bf3c8d8dbe125915314c8dd22de96dec997c7605c1
 EBUILD bzr-2.0.4.ebuild 3625 RMD160 d6a5e5db333bc1ab56ed213f6d11b33d8d5a7a4b SHA1 21fb78d56fd81a02a2e7ebcdbdeb43fcf46d833f SHA256 f94dc99f6e448ca39ffe26addf77cc345e6e663344afac4a1a22c763f3828ae3
 EBUILD bzr-2.1.0.ebuild 3501 RMD160 8297a28f3206df553baaa67e5a37defbdfb73d74 SHA1 4299df3adaeae748bb3d7483b41ee46d853eb285 SHA256 811e8006bc6dc236d52684a9a206418260915b5056ea068e1d2cebf2a915db8d
-MISC ChangeLog 19003 RMD160 c8aae1f3ab22fc1ba1a916836efccea9ff9a9f45 SHA1 e4aad61127daecad3f69d655a1e3a499f04805c0 SHA256 9337e05430f3ba405ed46bec4525f18b5eae78e3975577b723a40bc86e217b0e
+EBUILD bzr-2.1.1.ebuild 3503 RMD160 03f826dda0c6a5351a5b44c6fb6421c045667ab0 SHA1 90fd12999765191bb3a2191220e47c94b4058153 SHA256 2efd6fd1407995737c8f5d70689bb2d532369bc0dadc3224aaaffc69bae60f9a
+MISC ChangeLog 19159 RMD160 99266470ce1245bded570242b223c0b54871ca21 SHA1 2adb94a124c5acff908cc45f1465cc804eacc3d0 SHA256 28c93679b10d38c72c828d55330047bc957950086972f7312dbd6d63789bafc1
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuQ0UgACgkQNQqtfCuFneMsTwCeIAmecA5uwCTPpDivcqwpWd/M
-vxkAn2jumh69Z1whfhfDMjtG/2iPTkGn
-=zvUz
+iEYEARECAAYFAkurehkACgkQNQqtfCuFneOnpQCbBnfggF4pK/nQoBDm+xQ3Rind
+SKQAoIb+Rq//+47+2IPAvcLh86qeufkQ
+=dXav
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.1.1.ebuild b/dev-vcs/bzr/bzr-2.1.1.ebuild
new file mode 100644
index 000000000000..9710b0afa952
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.1.1.ebuild
@@ -0,0 +1,125 @@
+# 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.1.1.ebuild,v 1.1 2010/03/25 14:58:21 fauli Exp $
+
+EAPI=3
+
+PYTHON_DEPEND=2
+
+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 ~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.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}-2.1.1-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_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
+
+	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="("
+	#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+=")"
+	# 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 -A)" bzr --no-plugins selftest -x ${skip_tests} || die
+	else
+		"$(PYTHON -A)" bzr --no-plugins selftest || die
+	fi
+	# Just to make sure we don't hit any errors on later stages.
+	python_disable_pyc
+}
diff --git a/dev-vcs/bzr/files/bzr-2.1.1-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.1.1-no-pyrex-citon.patch
new file mode 100644
index 000000000000..02d6d833c2c3
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-2.1.1-no-pyrex-citon.patch
@@ -0,0 +1,33 @@
+--- setup.py.orig	2010-03-25 15:54:31.031989804 +0100
++++ setup.py	2010-03-25 15:55:24.943965524 +0100
+@@ -166,27 +166,9 @@
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+ from distutils.extension import Extension
+ ext_modules = []
+-try:
+-    try:
+-        from Pyrex.Distutils import build_ext
+-        from Pyrex.Compiler.Version import version as pyrex_version
+-    except ImportError:
+-        print "No Pyrex, trying Cython..."
+-        from Cython.Distutils import build_ext
+-        from Cython.Compiler.Version import version as pyrex_version
+-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
+-    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
++
++have_pyrex = False
++from distutils.command.build_ext import build_ext
+ 
+ 
+ class build_ext_if_possible(build_ext):