Add python3_4 support and fix tests (bug #457048).

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 30 insertions, 20 deletions

diff --git a/net-zope/zope-fixers/ChangeLog b/net-zope/zope-fixers/ChangeLog
index 439557c54d3e..c1495a8b6556 100644
--- a/net-zope/zope-fixers/ChangeLog
+++ b/net-zope/zope-fixers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/zope-fixers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/ChangeLog,v 1.17 2014/03/31 21:14:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/ChangeLog,v 1.18 2014/04/03 00:43:38 radhermit Exp $
+
+  03 Apr 2014; Tim Harder <radhermit@gentoo.org> zope-fixers-1.1.2.ebuild,
+  +files/zope-fixers-1.1.2-tests.patch:
+  Add python3_4 support and fix tests (bug #457048).
 
   31 Mar 2014; Michał Górny <mgorny@gentoo.org> zope-fixers-1.0-r1.ebuild,
   zope-fixers-1.1.2.ebuild:
diff --git a/net-zope/zope-fixers/Manifest b/net-zope/zope-fixers/Manifest
index 7bb3cc7405a0..a72848a72331 100644
--- a/net-zope/zope-fixers/Manifest
+++ b/net-zope/zope-fixers/Manifest
@@ -1,29 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX zope-fixers-1.1.2-tests.patch 470 SHA256 a952c35f2544c4217291fbabe1a291cf767b5d7cf9c5368b18dfad6608baf7fa SHA512 5c5a811d747004f5e359f08c7db293206acd658f07651042adf82c33b64e827fe59314b6570aed56fb4e2dc2ecc138f38cbfacff9b491b6499a1df7ea87f3c53 WHIRLPOOL caa083c985994ca8b790b04c5ced97159d34c8b02cac5716dcbac72af3559b599415efc4827d26acc77a17355001a4b2a264c4dc8d61cbd08749c634199817b8
 DIST zope.fixers-1.0.tar.gz 7287 SHA256 1483d52aee35b5050ca7b8b19ff3977aebad6aab494783def3b495219ec34d06 SHA512 e04134d05f7a591c3f71937d63e3cad1a04ad148b443b35c7649b47eb3b31894dc04586a36493fbb15477ea3ef1160e71be8ac124f4136f47875a3449e1b8c2a WHIRLPOOL 9bcd73585ffa747db77e9ba7ef8de91458464b7d35261360e735ab42be18ea6c5860f560b23e8d410e75bfe75f56e4360f6e223f11d0ba5329fcf2b213445f88
 DIST zope.fixers-1.1.2.zip 18309 SHA256 83300f0911ae3b6dff55f9d953d64de0b685cd1dd495cfb410d10fa861646005 SHA512 bbd331c20811f45191ff9b7334d8eab42c9592b5a65d974e61a6515f16a4c48e51048f912ddbf0f0d16747704c208d864179575e321a8705e1652364c8d91830 WHIRLPOOL cb42fba1e24f401c4ece2f41d714ff52e5aa94dfc0c086ec6b4059bbf69cb8b1509715239050c4680d26a9490126b59da41e9e103a1320542a84548d427e13c4
 EBUILD zope-fixers-1.0-r1.ebuild 920 SHA256 5cfb02120a420ed78bce15c8f4afbcbbcff47c1f6a0d57c685c49919f6ea1a86 SHA512 9c7a16708caad6b5f7c0f7111656d4ccece2b272aa0dc1fd8abddc2674747933caaa6787f9906c3359a5724d55cf46919a2f88ce7fa02c203ea556de0cb8de7c WHIRLPOOL cd02a539fc552c5b93a5e2ee982117e8e7409669973ea2acc29a577dc7556cb881f34b6b5ef175e655d0d6cfca2f6d94c8e5e9e495820bd1b61db2f4452abc00
 EBUILD zope-fixers-1.0.ebuild 1067 SHA256 ddd34adc81b8ca501e6a5302d293f058919b01087615eb9f6748fcbeec8a666c SHA512 93e74b5340fbe162c81f73d923a224c2964fa8c6f346d7bcb18d92d1b754712876a8caeb5e5fb5e9c5bdc56b1789a016f7b2fbd20c2e76eef5d3d3c88b37e0e0 WHIRLPOOL 03233aa99a43e51ff353a1c5c2343285285637bbe24eabc68ef09e869feb5bbabaa2aff60eec2e6a3406a3681bd0f2691ca36ab587593671852c607adac98067
-EBUILD zope-fixers-1.1.2.ebuild 932 SHA256 4301e1248afe4dcfb74ce834366c9d92c27c5fd7183ef6dd934ad5a4e65ccb2f SHA512 408607ef2e52c102dad5b0836819ad88dd3bad4d183a3e2f9be42e690279a03456a03dc608ceecf6388ff8a9ec6148328c97cd5fbccd43374db549661a0a04f1 WHIRLPOOL 8f9213d18d81b184ae71cab66ae9f5764807c9c19166d9d7d3b17c6a8105bd514424f1409d347143de736479c8d716b83a70ebdd38395d157c6933553d9f866f
-MISC ChangeLog 2304 SHA256 7b4ecd20e3a52eb50a400334615bb9ca693084af5740b56054d65f215f281778 SHA512 eed5a21f0b08d5085848c9b686044c8980a859734b3424cf699846fb794d91682ee37a48fea08fc19d06a59bcc20aade08a4a2f0aeb69dbfd67e8d4da36af9e5 WHIRLPOOL 3751bdf1014aa8a37f94d8d7391b37f9ffb7314d1ba55330f2c9ec86ab18a6d0d78450694fd6b50699c2f0cd3c53eaad3329402e2c5d1cf46d9184875aad1092
+EBUILD zope-fixers-1.1.2.ebuild 983 SHA256 145009a30e81741e70f08c2e06229f2decde60ee40881366f275bc1114260ecd SHA512 904a58a6312a47183277a747f21d6d7e15326cf8502cccffa47d8dc4a8d453af31515b18365e95dd37e9656e9ccd3c5272d368194688d7e7e4f0bfb0c7f04487 WHIRLPOOL 559422c9fedaf98e1cd59fa1fff216e94b4caced8f082dfb3ad0cc515caf3831606a1579dc0312af4ed953675b6d33a95bb7a9aebf2c20f1c2a0463a39755e4e
+MISC ChangeLog 2476 SHA256 7992cd3b572f60e50d9726c6ac1250457aff8ecb984f3b4f81ec37712b228680 SHA512 029f6c02a1502ebfc657a74820870bc17bb8582c0f5b50c755024d03d7ffb6cda939170af521148fd9f4fecb9705c4902d412b11fd3d3f91c64f168777cec90f WHIRLPOOL 16299fed0abc6f38db13d4ea9db3146de25a3e0d7b9180f39f09e0226605125fe7568c6db47ae87ec463a269bba5911d367d233f63451db1253d7172bb9507ea
 MISC metadata.xml 234 SHA256 4bc1314659ca2095b39d10334d2461a1609d959cc14663c7bbc0c2a15e9f54f4 SHA512 1cd4ed6a100773bbeb40e59314c05747428c27986cd3e9fe58585d5be296be1612460a70654ae84d69cfe776d3897d3046071815692244e94229adc8ec882468 WHIRLPOOL de4ff805977dc20c199696edf3b29ff001cca6775ebf8b943205aef92799774fa9d6a7e14c8e404019234ffced6058b85a1a37db83a189a91705cd6a583c2e1a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTOdqxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONQYP/0HkOFHgAsrs2Owseo8f1VQJ
-3teBqC349ZRMwGK0wfi1N4AZkNq3iDdhNn0IauyvKG1B9OI0IUp6zIPLo67tch1V
-nsUBLvMzAxRCy09z04Co80lL+SCGymn+RdBUhH8HCi/N4GToFDb0qTt7XWVQE4z1
-Zt8yUMxyLdQEoVONWwcfdS4ZvCRWLaBvEMoK6+qLyY5kwuXkR5ebwJMLhA6lI5LI
-+Nkjq0j67Pmd8+bXIiumIpCt5o7QmlZ71lr4eQ/E5PUBrIPpVnnN541mGURhOlkz
-tvWzjP1hNSk647g3bW2U6gynuOwMMgFIkQYYs9ivEoBo5h4NhXmh5rbjF4o/HRUF
-KjCaXUq9WMVvfvo1zqnjkp6/C5JdBtht3w5BJOBUL5NkZvthFJKXe5mL3LLOdwRe
-nLZFG4/hwbPNcap0Ax+V6MpEV2JcRw0kAhGn59CvhLl3DArG5xOYGYHxX1zvcF03
-fDkmR9P3ZqhqcBSmpNCYdG0xvKqzO1PGOexbaY3r3ufBLlUAZNNunSYx3FKd1kho
-IwtqK0TPfiXVLdLK8bIBJDPfJX05RgHddsHoEldO9DQbIo16SBWI1TeoVgq/lBwY
-jnNyyd2u8nXcnNUc0qsRfRj3Azn9a63fUeV3KVpIRyGOJisWe8+AIjsROY+S8ZgY
-PyrqzyIFf5gP3C/NHKMx
-=6EtD
+iQEcBAEBCAAGBQJTPK6+AAoJEEqz6FtPBkyjpRIH/RxKTuc2XS7TDQcxMDucaaig
+GRb8dqW55NHFKbT4Z/tit5+uWksT11Qu08OMEE3Y4eAdll/5aYCal95YEZMzHyuO
+lKJX6c8+3logvmjASwnIQzlvisBkTaVLTkemnK8x9VzvRpWvMWzjwGmTVfvoZelF
+fBhMAG2epUGgI4XPoWAYbZTFOn9LFTSnsqZaT50MFAb+rO/D3IlpjRcZ9psV7r2S
+JYNIYdd3BoUt2YwGvth0jrrscgliBCDTHwg33Yd75rgzZ9ISzNo1tqKQ3M2alREv
+FFH4xYNBg4iTQrF5IEu0bNrSYyS/IE2IzBJUHalIEPyPY7v8SnXHmEPIlZC6FXM=
+=N/a8
 -----END PGP SIGNATURE-----
diff --git a/net-zope/zope-fixers/files/zope-fixers-1.1.2-tests.patch b/net-zope/zope-fixers/files/zope-fixers-1.1.2-tests.patch
new file mode 100644
index 000000000000..a2646cc5f9fb
--- /dev/null
+++ b/net-zope/zope-fixers/files/zope-fixers-1.1.2-tests.patch
@@ -0,0 +1,11 @@
+--- zope.fixers-1.1.2/zope/fixers/tests.py
++++ zope.fixers-1.1.2/zope/fixers/tests.py
+@@ -300,7 +300,7 @@
+             msg += "\nFailed:\n" + refactored[i:]
+             msg += "\nTarget:\n" + target[i:]
+             # Make spaces and tabs visible:
+-            msg = msg.replace(' ', '°')
++            msg = msg.replace(' ', '-')
+             msg = msg.replace('\t', '------->')
+             msg = ("Test failed at character %i" % i) + msg
+             self.fail(msg)
diff --git a/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild b/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild
index 483c144848ac..88597fa0e944 100644
--- a/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild
+++ b/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild,v 1.4 2014/03/31 21:14:22 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope-fixers/zope-fixers-1.1.2.ebuild,v 1.5 2014/04/03 00:43:38 radhermit Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
 
 inherit distutils-r1
 
@@ -28,6 +28,8 @@ S="${WORKDIR}/${MY_P}"
 
 DOCS=( CHANGES.txt README.txt )
 
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
 python_test() {
 	esetup.py test
 }