From bbfacedb37e0f26bc9357be6dd79f9182ad582ae Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 21 Feb 2010 17:17:09 +0000 Subject: [PATCH] Fix tests with Python 3.2 (bug #306215). Package-Manager: portage-15417-svn/cvs/Linux x86_64 --- dev-python/jinja2/ChangeLog | 6 +++++- dev-python/jinja2/Manifest | 7 +++---- .../jinja2/files/jinja2-2.3.1-python-3.2.patch | 14 ++++++++++++++ dev-python/jinja2/jinja2-2.3.1.ebuild | 3 ++- dev-python/pywebkitgtk/Manifest | 4 ++-- 5 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 dev-python/jinja2/files/jinja2-2.3.1-python-3.2.patch diff --git a/dev-python/jinja2/ChangeLog b/dev-python/jinja2/ChangeLog index 9f72eba9a115..6c05f98baf5b 100644 --- a/dev-python/jinja2/ChangeLog +++ b/dev-python/jinja2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/jinja2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/ChangeLog,v 1.34 2010/02/21 16:06:15 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/ChangeLog,v 1.35 2010/02/21 17:17:08 arfrever Exp $ + + 21 Feb 2010; Arfrever Frehtes Taifersar Arahesis + jinja2-2.3.1.ebuild, +files/jinja2-2.3.1-python-3.2.patch: + Fix tests with Python 3.2 (bug #306215). 21 Feb 2010; Arfrever Frehtes Taifersar Arahesis jinja2-2.3.1.ebuild, +files/jinja2-2.3.1-python-3.patch: diff --git a/dev-python/jinja2/Manifest b/dev-python/jinja2/Manifest index 4d23101846fc..02afcaab211a 100644 --- a/dev-python/jinja2/Manifest +++ b/dev-python/jinja2/Manifest @@ -1,9 +1,8 @@ +AUX jinja2-2.3.1-python-3.2.patch 454 RMD160 80c271131fb7ed7cd182d8226abd710a92540da4 SHA1 05024ddc85297cde6bbf3861fac468df152f9f41 SHA256 0e7babebbf9cd10b3f878dc17872aa436116535db4ccc8f5702f20cdd076728f AUX jinja2-2.3.1-python-3.patch 1832 RMD160 55ef4dac02be3fb11f9e8d222c46d49fd5d1ef59 SHA1 c58ea05910dd41e853f601b2ef2a70e913626537 SHA256 91953e320b219949ee0d15f66311e7ff33ebadbf8d46a0ffd8de8e7299e35653 DIST Jinja2-2.2.1.tar.gz 771552 RMD160 bdee3ef806bc25f9eef388af2529bebdd44c1cf4 SHA1 e6b6ef07ba2e1c463120db134cec477abc4b723b SHA256 b90e99f12c035f67bcf9f865c46bb7048d62fbcadd892f5ae7633a4e53e01df3 DIST Jinja2-2.3.1.tar.gz 428770 RMD160 0e8331aa7af21b2b14d8983d4e3f96236d810ece SHA1 86db46f3f7afbc7b7fa27497359b498de07be0ec SHA256 012dad09654e76ccb2e1bddbddb8073009b42cd4a92021b6206db69e616bd66c -DIST Jinja2-2.3.tar.gz 675996 RMD160 6988ecf0115dd7829eac7c2e4b5d5bd1a17b6c8e SHA1 556e9eacdf79961e6f2eb938b2c2299e342d49f5 SHA256 58a257e26a53919058a27eb9aa3d74e29d5983dba82290fc1c1898f4ea249535 EBUILD jinja2-2.2.1.ebuild 1731 RMD160 7502b7bc4b4a1f3fdec95be1059def656df5fba4 SHA1 fffc7c136f32b4e940cb134c1b6500a5cd3cf7ef SHA256 3664144512cb7dd48937e2d723ce583bac7dd9a2f6c2100128674fe96eff9d7b -EBUILD jinja2-2.3.1.ebuild 1716 RMD160 48b48fbaf6bc1c4a86a8cce950075a28cc7b87b9 SHA1 b795718ddc1408ccd0037e57dd35505299bd92aa SHA256 d2e1b9921a98e05cbdd0ff2926b73fcaa13edb10438041b6b33afe333399de80 -EBUILD jinja2-2.3.ebuild 1723 RMD160 15e4bd717f9620dc0be848b6ad7a82736254b078 SHA1 3d3fb7b070a48ed52647be64398cd25d2b46ca6e SHA256 2955afdc7b29c90aa8d4a1e6203e6af3cf45b2fbaebc45f3b7dff84d55cb91dd -MISC ChangeLog 4121 RMD160 0eb4d3585a779b254a3339b121f8ca9b8f92f1f3 SHA1 c4d6f33b5b338b10cabfe4c036d2718b3fe70313 SHA256 a0976831435d4192f4f769b27df70f1d143e250f50e41c2541f37e9175bbec50 +EBUILD jinja2-2.3.1.ebuild 1760 RMD160 8786a1fe457f31a788c8014649c495c8144f0a8f SHA1 9a51850415f87a5faa727b3049b25bdfbac47910 SHA256 a5051f7fd286e3ae3b3d083e7271b4c8ef88a22ecbf540469cc88c7a1b47922f +MISC ChangeLog 4299 RMD160 010106265716209d2d1607d2f0e5ecc33664e07f SHA1 55fda4d47924a09e8ffe09dbc90ccdcaf7fc0309 SHA256 f0c8d64ba9cd334e71a3c4f02a5182a653042f62d0e8d653271d15713436431e MISC metadata.xml 260 RMD160 73b34094a529f5ab0dcf98717fe00e6759dfb397 SHA1 48e84c78c92d7b5cdadb9db94c7c5681158ab498 SHA256 02bf37f6abc119298b0af0cfc3ce295479e514b0c1b39465e2c4e8f1b1628f7c diff --git a/dev-python/jinja2/files/jinja2-2.3.1-python-3.2.patch b/dev-python/jinja2/files/jinja2-2.3.1-python-3.2.patch new file mode 100644 index 000000000000..ae5cee1ccea4 --- /dev/null +++ b/dev-python/jinja2/files/jinja2-2.3.1-python-3.2.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/show_bug.cgi?id=306215 +http://dev.pocoo.org/hg/jinja2-main/rev/2e4934235d58 + +--- jinja2/testsuite/debug.py ++++ jinja2/testsuite/debug.py +@@ -30,7 +30,7 @@ + \{\{ fail\(\) \}\} + File ".*?debug.pyc?", line \d+, in + tmpl\.render\(fail=lambda: 1 / 0\) +-ZeroDivisionError: int(eger)? division or modulo by zero ++ZeroDivisionError: (int(eger)? )?division (or modulo )?by zero + ''') + + def test_syntax_error(self): diff --git a/dev-python/jinja2/jinja2-2.3.1.ebuild b/dev-python/jinja2/jinja2-2.3.1.ebuild index 4079dc4dfb94..4006f1b8e142 100644 --- a/dev-python/jinja2/jinja2-2.3.1.ebuild +++ b/dev-python/jinja2/jinja2-2.3.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.3.1.ebuild,v 1.2 2010/02/21 16:06:15 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja2/jinja2-2.3.1.ebuild,v 1.3 2010/02/21 17:17:08 arfrever Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -34,6 +34,7 @@ src_prepare() { distutils_src_prepare epatch "${FILESDIR}/${P}-python-3.patch" + epatch "${FILESDIR}/${P}-python-3.2.patch" } src_compile(){ diff --git a/dev-python/pywebkitgtk/Manifest b/dev-python/pywebkitgtk/Manifest index 712a1c8fb3c3..434183ef75fa 100644 --- a/dev-python/pywebkitgtk/Manifest +++ b/dev-python/pywebkitgtk/Manifest @@ -1,6 +1,6 @@ DIST pywebkitgtk-1.1.6.tar.gz 327662 RMD160 0fce023574fbd52116195bf05e57b7eff38b3245 SHA1 17cced538540dd2d97b0256e2c3677cd03ee7193 SHA256 8a1045fd72b301161d94cc272d056ed56246224b866bcef1a036e19b6b7da497 DIST pywebkitgtk-1.1.7.tar.gz 333819 RMD160 c8f1d838d13bee68eb0299adadfbd9d1355c3798 SHA1 e3416d9455fe7d9947b079c66f40008a01f80055 SHA256 86ec33ca842eb07caf9a6c6ff12368bd1d125c8296198239f3515828483fac3f -EBUILD pywebkitgtk-1.1.6-r1.ebuild 1256 RMD160 602fe258c0129a14b0a37c08e9607a66563b7c63 SHA1 50df92088644aa9c0e3449a66698d36130fbedbf SHA256 f39e569ce8ee953386b89d00367f0349a7c674c9919543d09bd0592c807953d5 +EBUILD pywebkitgtk-1.1.6-r1.ebuild 1254 RMD160 d650489708f3252f49487825e82a129ad99c70b7 SHA1 b463cd26aa349c904f561de6246a74db7ca2a46e SHA256 5c0047aa0c3f855e528bd5c70f2d866d414e737a39c748366a853edc97fa0acd EBUILD pywebkitgtk-1.1.7.ebuild 874 RMD160 ef3a18ad95021dcda7d363a2588aee58205f97d0 SHA1 b90105a7585112aafd3803867936d5a57285c7f8 SHA256 00cb9338768a37e612535ac38c2cf1060da057a8ad8ee91fdc01fc1989c51e81 -MISC ChangeLog 2155 RMD160 54526d58053e7b06f08ed677fd93d2da99eb8fd8 SHA1 539c1d323e5144faf5e7bd7568d660cd199f1d53 SHA256 8fd9ac7eee0ecd1509db80c6bb48c0f812833b27ff161969c384ae7ccaf517e7 +MISC ChangeLog 2262 RMD160 89d5c1cd6369fe75b687d22e35264ebe474f51ee SHA1 45442e8ee866e68276ae6b8f7b34d0768488d58c SHA256 364dc141a297a2cfbee04c3f1bc699ee824aae5b1708c9ad03081c01b4d978b4 MISC metadata.xml 352 RMD160 a2b3691bbce440da71d395e06fb564c98cefab71 SHA1 d6b129ddda9c52558a4b7f62ebbabb25f9bfe1d0 SHA256 4cc944f66dc9e5b9ccd3e6573681b2812a5d91d949180f90d4a74ae8bd88e49a -- 2.26.2