version bump

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

4 files changed, 180 insertions, 2 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index f89f5a5df1dc..2a92248bae48 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.41 2011/11/06 16:19:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.42 2011/12/26 12:04:37 fauli Exp $
+
+*bzr-2.4.2 (26 Dec 2011)
+
+  26 Dec 2011; Christian Faulhammer <fauli@gentoo.org> +bzr-2.4.2.ebuild,
+  +files/bzr-2.4.2-no-pyrex-citon.patch:
+  version bump
 
   06 Nov 2011; Brent Baude <ranger@gentoo.org> bzr-2.4.1.ebuild:
   Marking bzr-2.4.1 ppc stable for bug 
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index 8008ef6addd8..9fe15519f29e 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,14 +1,27 @@
+-----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
 AUX bzr-2.2.0-no-pyrex-citon.patch 1191 RMD160 5096704ac9547fe44e40b954d780141186de70d2 SHA1 1eb07ce2b3847c3a792c603241d209da3b1fffe2 SHA256 e24852b7ef0f698d3c870b71ba615a9452c8a62c6a5e0ac7328e074d4d4adef2
 AUX bzr-2.2.2-python-2.7.patch 1442 RMD160 b3abc70fe110c395f0fe9ea048dd2a3601709254 SHA1 d1ca99405c5d55c62355f947ff9a897985d4f55c SHA256 0595c35539d1845ed21466aeab3115cecb07ee3e424d39ad2683267adc67d24f
 AUX bzr-2.4.0-no-pyrex-citon.patch 1191 RMD160 4890e3d07ddff670f7a6dd3bcea01ef0aab960bb SHA1 17da49727f57d5d234bdafd1fa4b8916eb173f3e SHA256 aee30b05c68ee692825f49b30db8841b93a2ef844c1dd97159cd8d0a8f77fc09
+AUX bzr-2.4.2-no-pyrex-citon.patch 1203 RMD160 1be0b9a40f8b10542d49153c654789981c722f00 SHA1 5d553b81e5f071cd53113ee2fa026efddd063476 SHA256 fa3ba0fa833eeeafe748fcf4241acdba39a124116acd522b49381b4efd520c24
 DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SHA1 9db8f061d94ba3f0b48dcd623c473c6e8b570b6a SHA256 734ee0c3a64e7b820d6632ae0e2a4bf91add908fdebe5c82865618c38175c8e3
 DIST bzr-2.4.0.tar.gz 7522083 RMD160 68508cf0188fba6507cbef6274c08e3f2038698e SHA1 94f0de11e1acc9f07765174f0a01d7fd01da568a SHA256 b1052d8fdb6e9ee63d98a11186295013d6a0c4cdbe0f832c014dff6a3ecf6be0
 DIST bzr-2.4.1.tar.gz 7279631 RMD160 539c5205fe9c1c6820ad6a87caddbdbe900f834c SHA1 5a9da32fe6dfdbd13826b293c007683c9858fcab SHA256 548bd4849e9e7fb3938277249fa026455e60054c78912d665694384af1f07fe6
+DIST bzr-2.4.2.tar.gz 7528721 RMD160 47ecfd1651d10aeea28c0dff3124c637dbbb93ab SHA1 3663b862dc8fb9729f9aae2427cbab2af9c901ad SHA256 a5b8db77c61e54450680befdbb4795f8a972fa5a167123786360d898b752656f
 EBUILD bzr-2.2.2-r1.ebuild 4008 RMD160 6a66fb84971bd83d155255ba3102ae115e843f51 SHA1 8c6409561102e6db409e04f8fa772c59c7c80459 SHA256 3b06b5af051c8cf0c3a6c9aaa1589852b100e91c195798285d39d5a446ecd7ad
 EBUILD bzr-2.4.0.ebuild 4561 RMD160 5609878647dacae25f6ade03c88ff78f57683e15 SHA1 d487e32eb2fc3245a9d7fcc14893ff593d59397f SHA256 5b591262de192575512c1b353fc04fc3e6044c71ab1cf1c3b5a2de057e8ef9e0
 EBUILD bzr-2.4.1.ebuild 4606 RMD160 a893bffd34e953a204329e59c38f9fb7aced7d41 SHA1 e028169e49da6dcf9fbfbf86191b50670edf831a SHA256 bbfd700f3746ee0c96e29aeae46a64392d00ec1a3c718e1fbe3a2a6ddccf85a5
-MISC ChangeLog 24235 RMD160 5638db8d3e0a456e620f0fad3eb4cc4ab9f995e2 SHA1 b5403f198668a9530a4932cfb7fb06733ef47e2a SHA256 5638e94b4373da1d378806024c507a28c30f9b7dc106fd92a4d9024616f86238
+EBUILD bzr-2.4.2.ebuild 4612 RMD160 faab2ad7d7983858d900e30745ba5afa1a476b63 SHA1 c06b7c2775ec40f5ebf124ff8e49eb1e4d98127c SHA256 24efb3c8c8dac0314863dd42b0c44029960a74b9abe7c4d570ba1f6283a8b9e7
+MISC ChangeLog 24391 RMD160 f42855c96170f6606ad8e06c269946ebd708e961 SHA1 a2bed0c3a6956e9fc4377c8dff2c1c1e5774bad5 SHA256 8840cc9e7402fa5588e7d35a1663013ddb46344527ee1f76ab798022505282cd
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk74YxgACgkQNQqtfCuFneNDtwCfb4WIA1KwaBw6szxaRltHfXt5
+eqYAn0hxkbgloS8KYdAVdrNFshdZE4W7
+=ngO9
+-----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.4.2.ebuild b/dev-vcs/bzr/bzr-2.4.2.ebuild
new file mode 100644
index 000000000000..1e69d576bc82
--- /dev/null
+++ b/dev-vcs/bzr/bzr-2.4.2.ebuild
@@ -0,0 +1,126 @@
+# 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.4.2.ebuild,v 1.1 2011/12/26 12:04:37 fauli Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.[45] 3.*"
+
+inherit bash-completion-r1 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 ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="curl doc emacs +sftp test"
+
+RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celementtree )
+	curl? ( dev-python/pycurl )
+	sftp? ( dev-python/paramiko )"
+
+DEPEND="emacs? ( virtual/emacs )
+	test? (
+		${RDEPEND}
+		|| ( dev-python/pyftpdlib dev-python/medusa )
+		dev-python/subunit
+		>=dev-python/testtools-0.9.5
+	)"
+
+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.4.2-no-pyrex-citon.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/850676
+	skip_tests+="per_transport.TransportTests.test_unicode_paths.*|"
+	# libcurl cannot verify SSL certs
+	# https://bugs.launchpad.net/bzr/+bug/82086
+	skip_tests+="per_transport.TransportTests.test_clone|per_transport.TransportTests.test_connection_sharing|per_transport.TransportTests.test_copy_to|per_transport.TransportTests.test_get|per_transport.TransportTests.test_get_bytes|per_transport.TransportTests.test_get_bytes_unknown_file|per_transport.TransportTests.test_get_directory_read_gives_ReadError|per_transport.TransportTests.test_get_unknown_file|per_transport.TransportTests.test_has|per_transport.TransportTests.test_has_root_works|per_transport.TransportTests.test_readv|per_transport.TransportTests.test_readv_out_of_order|per_transport.TransportTests.test_readv_short_read|per_transport.TransportTests.test_readv_with_adjust_for_latency|per_transport.TransportTests.test_readv_with_adjust_for_latency_with_big_file|per_transport.TransportTests.test_reuse_connection_for_various_paths|test_read_bundle.TestReadMergeableBundleFromURL.test_read_mergeable_respects_possible_transports|test_read_bundle.TestReadMergeableBundleFromURL.test_read_mergeable_from_url|test_read_bundle.TestReadMergeableBundleFromURL.test_read_fail|test_http.TestActivity.test_readv|test_http.TestActivity.test_post|test_http.TestActivity.test_has|test_http.TestActivity.test_get"
+	skip_tests+=")"
+	if [[ -n ${skip_tests} ]]; then
+		einfo "Skipping tests known to fail: ${skip_tests}"
+	fi
+
+	testing() {
+		LC_ALL="C" "$(PYTHON)" 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/files/bzr-2.4.2-no-pyrex-citon.patch b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
new file mode 100644
index 000000000000..a5128a03d628
--- /dev/null
+++ b/dev-vcs/bzr/files/bzr-2.4.2-no-pyrex-citon.patch
@@ -0,0 +1,33 @@
+--- setup.py.orig	2011-12-26 12:42:40.308882969 +0100
++++ setup.py	2011-12-26 12:43:38.861854988 +0100
+@@ -178,28 +178,8 @@
+ from distutils.errors import CCompilerError, DistutilsPlatformError
+ from distutils.extension import Extension
+ ext_modules = []
+-try:
+-    try:
+-        from Cython.Distutils import build_ext
+-        from Cython.Compiler.Version import version as pyrex_version
+-    except ImportError:
+-        print("No Cython, trying Pyrex...")
+-        from Pyrex.Distutils import build_ext
+-        from Pyrex.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.rstrip("+").split('.')))
+-
++have_pyrex = False
++from distutils.command.build_ext import build_ext
+ 
+ class build_ext_if_possible(build_ext):
+