diff options
Diffstat (limited to 'dev-vcs/bzr')
| -rw-r--r-- | dev-vcs/bzr/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-vcs/bzr/bzr-2.5.1.ebuild | 6 | ||||
| -rw-r--r-- | dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch | 24 |
3 files changed, 34 insertions, 3 deletions
diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog index dfad51ad7d88..38da3a10c88d 100644 --- a/dev-vcs/bzr/ChangeLog +++ b/dev-vcs/bzr/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-vcs/bzr # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.55 2012/07/01 06:07:58 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.56 2012/07/02 11:54:26 marienz Exp $ + + 02 Jul 2012; Marien Zwart <marienz@gentoo.org> + +files/bzr-2.5.1-sphinx-test-failures.patch, bzr-2.5.1.ebuild: + Add patch fixing sphinx-related tests, tighten test-only ftp server dep (see + bzr relnotes). Bug #424395. *bzr-2.5.1 (01 Jul 2012) diff --git a/dev-vcs/bzr/bzr-2.5.1.ebuild b/dev-vcs/bzr/bzr-2.5.1.ebuild index 76bc1a2238d4..eae167c8850f 100644 --- a/dev-vcs/bzr/bzr-2.5.1.ebuild +++ b/dev-vcs/bzr/bzr-2.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.5.1.ebuild,v 1.1 2012/07/01 06:07:58 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.5.1.ebuild,v 1.2 2012/07/02 11:54:26 marienz Exp $ EAPI="3" PYTHON_DEPEND="2:2.6" @@ -29,7 +29,7 @@ RDEPEND="|| ( dev-lang/python:2.7[xml] dev-lang/python:2.6[xml] dev-python/celem DEPEND="test? ( ${RDEPEND} - || ( dev-python/pyftpdlib dev-python/medusa ) + >=dev-python/pyftpdlib-0.7.0 dev-python/subunit >=dev-python/testtools-0.9.5 )" @@ -46,6 +46,8 @@ src_prepare() { # Don't regenerate .c files from .pyx when pyrex is found. epatch "${FILESDIR}/${PN}-2.4.2-no-pyrex-citon.patch" + + epatch "${FILESDIR}/${P}-sphinx-test-failures.patch" } src_test() { diff --git a/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch b/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch new file mode 100644 index 000000000000..ac1fd0212d6b --- /dev/null +++ b/dev-vcs/bzr/files/bzr-2.5.1-sphinx-test-failures.patch @@ -0,0 +1,24 @@ +Upstream revno 6523 ((vila) Avoid test sphinx-related failures now +that we don't have direct sphinx anymore. (Vincent Ladeuil)) + +=== modified file 'bzrlib/tests/test_utextwrap.py' +--- bzrlib/tests/test_utextwrap.py 2011-05-28 06:44:01 +0000 ++++ bzrlib/tests/test_utextwrap.py 2012-04-17 12:18:27 +0000 +@@ -171,16 +171,6 @@ + + + def setup_both(testcase, base_class, reused_class): +- +- if (features.sphinx.available()): +- # Until https://bitbucket.org/birkenfeld/sphinx/issue/706 is fixed, +- # we can't run these tests when sphinx <= 1.0.1 as it breaks +- # textwrap.TextWrapper.wordsep_re +- version = tuple(map(int, +- features.sphinx.module.__version__.split('.'))) +- if version <= (1, 0, 7): +- raise tests.TestSkipped( +- 'sphinx textwrap monkeypatch breaks utextwrap') + super(base_class, testcase).setUp() + override_textwrap_symbols(testcase) + reused_class.setUp(testcase) + |