diff options
| -rw-r--r-- | dev-python/testtools/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/testtools/Manifest | 15 | ||||
| -rw-r--r-- | dev-python/testtools/files/testtools-0.9.4-fix_test.patch | 10 | ||||
| -rw-r--r-- | dev-python/testtools/testtools-0.9.4.ebuild | 9 |
4 files changed, 35 insertions, 5 deletions
diff --git a/dev-python/testtools/ChangeLog b/dev-python/testtools/ChangeLog index 6873da7b0446..33b1d2016497 100644 --- a/dev-python/testtools/ChangeLog +++ b/dev-python/testtools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/testtools # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.11 2010/07/18 06:48:32 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/ChangeLog,v 1.12 2010/07/20 07:31:17 fauli Exp $ + + 20 Jul 2010; Christian Faulhammer <fauli@gentoo.org> + testtools-0.9.4.ebuild, +files/testtools-0.9.4-fix_test.patch: + fix tests with upstream patch *testtools-0.9.4 (18 Jul 2010) diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest index 7412f70090d3..91418afc32d4 100644 --- a/dev-python/testtools/Manifest +++ b/dev-python/testtools/Manifest @@ -1,6 +1,17 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX testtools-0.9.4-fix_test.patch 364 RMD160 5b2d1e88526376f88f236aaa5794430578d90189 SHA1 434c5518f8f7570695d6080a772002c33271f732 SHA256 9a77e430648a0cba4d5d7f1f50219da062dc9e2fd29498d9eb1b0ac7da3b5c94 DIST testtools-0.9.2.tar.gz 34675 RMD160 894c8b77a6694f6839a910c5d0af29d67c01212d SHA1 6c22f64b074cb1600d9c9bbb48d89ebb222c31a8 SHA256 6d796512736ed1bdfa23cb911d17c6c32b7cfd976b5d44d6b4ed29570b728eed DIST testtools-0.9.4.tar.gz 50775 RMD160 133784066a9dfab649e503a947196aa917ba8fb4 SHA1 cecbd057ea125810ef5495e57ca66e766d0b8ecb SHA256 b9fec48b59e5f8bed90ae0c7a1e3c606e1b361fa69a1cabd25edfd0b3b3c2ed8 EBUILD testtools-0.9.2.ebuild 856 RMD160 e916a2c5b9f4e91dec9e3370f6689205b6800d7e SHA1 ac30aca9ec63dab2ba09a87030e6b09958cf93a5 SHA256 7711d635cae75fe141650ef76cd41db02c5594d10c766dc9202a12f6df00a2e8 -EBUILD testtools-0.9.4.ebuild 812 RMD160 b6aa5cef07d805e4cee49b42deae9c1cf017a0ec SHA1 33231c499862bba0471025b9030d4d792cf27508 SHA256 03fc55e1c2d2e49bc1a4256cbc30fcea1253444179d7f2310a8d619f7629cf15 -MISC ChangeLog 1541 RMD160 6c6d36b2af565a93c89b3409235055cac30e6206 SHA1 9c7f78b28afca2e062792258a6a95d19658e1bc3 SHA256 7ba9f3887f5f76134292ab3ce07c5106f49facf46bb86b89fe12121800669b34 +EBUILD testtools-0.9.4.ebuild 918 RMD160 0fad64cf021909ce9328346fb51cf1c8a91c9676 SHA1 e7033f73edc20385137da0e9c2323f2beff52c8f SHA256 1a1ea1075b7a0b921bbf4e1bb85fb47cafe9a885b65c9912647d02e19e003854 +MISC ChangeLog 1694 RMD160 6158099524d3c9e339d1e0c387ef1226f7d689a0 SHA1 e0cc6c77f423a2421d86f44c7c3c0c9785b28e7a SHA256 ea18d5eceebaa86e30c3d64fe5275f087e3f174bcd5b8c69d3fb7519b72d4e99 MISC metadata.xml 183 RMD160 3d7d3ef1c7fc2ad46c3bd8e2d8a728c8aac5d98e SHA1 467d0cbe06164e9a6b36ddf69790013d55b7d871 SHA256 37cf175469989020dfc412334d876157ffda2f766d2642104f8480a9e50ae51c +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iEYEARECAAYFAkxFUVIACgkQNQqtfCuFneNSqQCfdehsHkgD0TCVlskqVniQ71xf +LpsAmwcm74jojukMVnd5G85d78/QFg3v +=BHJB +-----END PGP SIGNATURE----- diff --git a/dev-python/testtools/files/testtools-0.9.4-fix_test.patch b/dev-python/testtools/files/testtools-0.9.4-fix_test.patch new file mode 100644 index 000000000000..688627bf374f --- /dev/null +++ b/dev-python/testtools/files/testtools-0.9.4-fix_test.patch @@ -0,0 +1,10 @@ +=== modified file 'testtools/testresult/real.py' +--- testtools/testresult/real.py 2010-07-02 00:40:20 +0000 ++++ testtools/testresult/real.py 2010-07-19 17:37:46 +0000 +@@ -566,4 +566,4 @@ + if not chars[-1].endswith('\n'): + chars.append('\n') + chars.append('------------\n') +- return _u(''.join(chars)) ++ return _u('').join(chars) + diff --git a/dev-python/testtools/testtools-0.9.4.ebuild b/dev-python/testtools/testtools-0.9.4.ebuild index 46b9153eed29..6c5848f51b99 100644 --- a/dev-python/testtools/testtools-0.9.4.ebuild +++ b/dev-python/testtools/testtools-0.9.4.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.4.ebuild,v 1.2 2010/07/18 14:01:04 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/testtools/testtools-0.9.4.ebuild,v 1.3 2010/07/20 07:31:17 fauli Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" -inherit distutils versionator +inherit distutils versionator eutils SERIES="$(get_version_component_range 1-2)" @@ -21,6 +21,11 @@ IUSE="" DEPEND="" RDEPEND="" +src_prepare() { + # fixed upstream for everything > 0.9.4 + epatch "${FILESDIR}"/${P}-fix_test.patch +} + src_test() { testing() { PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" -m testtools.run testtools.tests.test_suite |