Patch added from pypy.org/issue1366, makes testsuite of Djblets pypy capable wrt Bug #451958 , decision not to revbump due to onerous load to rebuild

Package-Manager: portage-2.1.11.40/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 340 insertions, 8 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 3fa394e66412..e113143e4267 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.33 2013/02/17 22:45:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.34 2013/02/21 15:25:39 idella4 Exp $
+
+  21 Feb 2013; Ian Delaney <idella4@gentoo.org>
+  +files/2.0-encoder-3655afd07f2f.patch, pypy-2.0_beta1.ebuild:
+  Patch added from pypy.org/issue1366, makes testsuite of Djblets pypy capable
+  wrt Bug #451958 , decision not to revbump due to onerous load to rebuild
 
   17 Feb 2013; Mike Gilbert <floppym@gentoo.org> pypy-1.9-r2.ebuild,
   pypy-2.0_beta1.ebuild:
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 992e5a51b0c7..ac1eb7be8243 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -16,6 +16,7 @@ AUX 1.9-ssl-errors-25d3418150d2.patch 1480 SHA256 b108e679545b81ca87c391a92b9cc6
 AUX 1.9-ssl-threads-1-34b3b5aac082.patch 5068 SHA256 02a8d9d5bd0e9c09ae545cf58c85e59d035d208d739adb84d778e8997d75a1d5 SHA512 1a55b72d62fc74e7d2fa4aa11294862782978d1a7f5ca6fb3f58deafb2d9aa4b54bd49a59334abb111543c798fcb817844ec19f70f88235b3046bea707bca077 WHIRLPOOL a5818b6711260a972b2af5d0cafebb47a2d887d207f25cf320ffc9488d2ea94b6ce5bbd6ae801c131ac83c0ee3cba26082e5300b8a50f36f0d0350668d1b718a
 AUX 1.9-ssl-threads-2-25cd11066d95.patch 648 SHA256 daf33460b2e7f17a45cf44331e00df84c2651a8446299700320fc75e53392f6d SHA512 cb489a6fd6b805f251b2139420992cdf7b7aec2425c6f5acd3be7d0dba7d85eae689073cd29b083685bef5696ea6c237673876e3d01f5b6b955ce8c3f3764173 WHIRLPOOL 97c6fc342b8eef9388b6df7b0a2dcceba73c7dc667e06ccb227017fb85feec1cc5e4e236f50e61a72573493daa4fb4b16d8ec2907f0f507a2364690b1afc883e
 AUX 2.0-distutils-fix_handling_of_executables_and_flags.patch 15198 SHA256 9b2f95b835651e9a592acec9ea347cf99a4e9bb84418a73c6d5ce80b98b1fb08 SHA512 06888c2bdb4dc87ef44e6cb3c4684cd0d686469a43e8b9f591888205c61e19a457ef330dedee71b7d3e00612e234ec55ea6ade1daa1ad549e33ac8db8ad1a771 WHIRLPOOL 33ece4661c49e836c33253b5d00e0f01ce873685ffb3fe461a1b4e64471d933c8d4d76b25955a13967b6f68f9f232239c690cd8ad23ba71825af9e4fd49b6c8a
+AUX 2.0-encoder-3655afd07f2f.patch 13820 SHA256 2161f34b6ec716737b0fbf7701ba96e1b40c3ff3d7246d5468e4132a94b692d0 SHA512 64a898bd68d99dda98df614791cfbb2bec102bcfe784de7b312caac956d47ed1210c338f9d8ab618b5b099b9e9f5ac6fa03b47e3c6167e52e72e1b24cf78631c WHIRLPOOL 970eb2db9e7bb699864e2984924a04763b328ee4704c8e6b223c05951ad71ed6a7ffdd7cbb1c8ceb2c00927a30194ba6f75a55ef24f8e8e09fb796255e5b0958
 AUX 2.0-no-static-hack.patch 1542 SHA256 75a92094d5f6c6bc2411a40f7432108c07c542e4b96de2b873a42fabf0f768eb SHA512 50c1087eae07fcef306de83ccde7edacea552e498f7dab3fa43626d05c38c9eaabf7a45780b8315b8b9d841da6086ee23cde1e51bf4796ac397e9b8d94bc316b WHIRLPOOL 97ca09dcf34602cce274611d607c0a1356f760a6e5d6b62010cec1fd33d677853b6cdab41fd52aedf0c5e506c331f80c37ec4547fae34ae9fc041fb14e9707ce
 AUX pypy-1.7-distutils-fix_handling_of_executables_and_flags.patch 18064 SHA256 43cbabdf5f7b094eb969c754bb6513fa324b1fadb40b37d78bd1ad47194d787a SHA512 eb6c70b84d204aca9975efd99ae66f8a629f275173a4551e99250e989fbfb1bc6d8696fa46e4a320425084540f845b6dd9068ebf6f7b17d99351c4d324b64049 WHIRLPOOL ba514f2b4f5746b90d380843bc09974fa3cd0657a8af9da12e4a780d03cd1213b022e92b5d6d0256b204084952f372a4af0f7de3a2a5c0baa7252957334c7546
 AUX pypy-1.7-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 569 SHA256 55ea809a5f3e264b1905b06aa3af78aae149451e7d74a98d11e87629ab69493e SHA512 d4627a762a5cbc45ea3f03686249b6fc206346d0514ecbb4e41c3c20f480c6fd9e689ec156a94dd8f88f4318fb48dc4a7b556e586e9f175627b6177391f64ca3 WHIRLPOOL 4f1b8e235851a52fc63c2022f98fdaa426d49f65a7e01e51625adc54efb0b17081a342db330ad269b8dbd4597db214c9b2cb32195048302addf1926ffb0e2464
@@ -24,13 +25,13 @@ DIST pypy-2.0_beta1.tar.bz2 13654084 SHA256 492fcdd8f37990e7364eb5f2c4b5c2b0f61b
 EBUILD pypy-1.9-r1.ebuild 3824 SHA256 28babbcc17d1b081558493c8b0bbf568b98367d301ef8afaf060a584eefa6919 SHA512 2ee0246a13e399c7842e445062883c57525ea24314c1cfb43d10e4bb67607560a015dc2ad2ed7a24994ff528a0ea782efbac142ada5ad0a9171ea490494a82dd WHIRLPOOL 4702569f02d402de5e45159df05a272e9e853442c114889c634f3f996770c1f4fe7e3c3d8e8d56765bb03a0ecfdaabfad045e50670bd6452825db06bfd303e9f
 EBUILD pypy-1.9-r2.ebuild 3897 SHA256 fa1f7192118019b73b6e1c399603cdc98fffc24e29018a9d2bbf2de6364761ca SHA512 920a6691835f8b7822e63b520f5b5d3ba367b55f56d61520552020154c3dd69c79d2b5fae155f3d29a99261f9643b5b12429d8fcf4c6e2f2d928d2f900652323 WHIRLPOOL a6552d90181c09eea456a37d9a253bbcdd29c96956d7113aaa38b5d050f03cc1068fbe2e8e72c6aa7468026ecf30abf6fd642a84d884c451339bb88b60dfab9e
 EBUILD pypy-1.9.ebuild 3075 SHA256 4c49bc7e33ea8eccc5552e30cd2dab691ed579a5686b71ec97bccfa9336cc798 SHA512 3758cb3f6b0f34e45318e31a5765dffe369f0b63dbed1471f46c2c0c1948359026c413c19c77a95da5e16ebf96034186fc02a6bcf15f62dea5a034f6ccf13468 WHIRLPOOL 544d46da00f3e17c607cd284ac0413ccd565428e1d7a0217d1f2fd1bbb927433a9147b57957b293976c9eb26507e0365fedb26b58af0ad6bfdf6c16b27dd691e
-EBUILD pypy-2.0_beta1.ebuild 3271 SHA256 aaac0d068430cd046122b5e8ae47c48dc3d406fa27a69482c37842bc661e2202 SHA512 1a396bae9bd8dbf11afd713eaafeed882398f6b5f7e7ae645f1829c7dd03717b25f59f84ebbe834eefc50e879a791a6039e837ec3484b610a77d674b6a6f1afe WHIRLPOOL 8b1be5a3640e18bb3dc3c407f9e79b37da300e5aa0ce2d65f40add36702c0b7cba9b857248735ad5e760942f630f4ec336ae8f3776666f19a3eb1ed96fb2d526
-MISC ChangeLog 6369 SHA256 1b14b83b9c8fee4f2483a44b9c0dc745a997b000c8ed2763182d93799277f4c5 SHA512 c5b5c1955578597d80ac3233ccfd1f732917555b5b1d285805c93e8a9a9eb1055fd8f516cf94f51d44d370acc60871219fe697aa8dbc31094fca0c53c0839958 WHIRLPOOL 5d3d1c8abd8da6451615b226af82794ba9141f9d4ecd8803b36e433492d14ebc3c1b2a75d503b72a21dd6b584c01e118e5bab75a50d609cc956c2d486b587a80
+EBUILD pypy-2.0_beta1.ebuild 3320 SHA256 6c0cf72ab9059a1d90b6c8eeda1d3c30e392f656fa1cf8616b32fce21f9d536b SHA512 54a68029d6fa41632597cfd402ce78cdde0906a3aba9ffbbe789fbf1b0196ac41cf391a3b7938edaf3a4c3c908047f6d642bb94c3812186849221204ea9b5715 WHIRLPOOL d6205a4cf9934415830a3f231ad9b12ff302cf8120092d62726367610fd94879b89d3ab7c40c4d9ba2418a80264ddc8e1c04ea0ee5836d141c5c154bb33a290c
+MISC ChangeLog 6636 SHA256 7029c261a32611d84fe1866e121bc0febb2562a39e264b74488551a86fbb29b1 SHA512 6d9a0e396c453e266653ff183d94537e70263d8c2b5be6827c42b5133087b53b78084a78c00e43b43cd6e37c615f8bc6c4ba70e59083d3ab3fab12c7f2594788 WHIRLPOOL b8607dfd1dc66948ddb71364dc94c09c93b265bab47955ab0474f58f1d4e858f3078011286e9953752859ff8142fcaa26bc991ec24d66516e8fe5680a7e6e8f6
 MISC metadata.xml 317 SHA256 cc6a42b7408bb6e6cebac0475a3419ff0f0e97c1301d5bdef029b3c24e278155 SHA512 87f0c04a0a10af65c51f587c3937995dcd5ddffe02caab1939a5562ddfbadd6baf5c8793c5f74717887d5779aaad6b7249a2a12d7f0f840cca6d79cdffa2ad7a WHIRLPOOL f5a509de1f99f97266128d34b79654a848c72d6a58caa19491874abe7c37fab047d6684c15397ed6f37f8b6e2ef35c0bc3e2831dd7d37739bc36116cc1b49284
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEhXYAACgkQC77qH+pIQ6SQLQD/UyRdUXUZu4zoL2S5sMprWCIG
-gD2ZcyFbj0lKZtVHWpoA/ix5u9f2rZVpE5KVmYyMWy7jwExSovHh1CAGfyKDv7gg
-=xjcU
+iEYEAREIAAYFAlEmPJMACgkQso7CE7gHKw3DfACfYAOs7viLVWtlmfu77Tf+wnEy
+1jAAn2q6GGH4T5evhfsptQ46CbuqmeAl
+=Gemb
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/files/2.0-encoder-3655afd07f2f.patch b/dev-python/pypy/files/2.0-encoder-3655afd07f2f.patch
new file mode 100644
index 000000000000..bba88c54cbda
--- /dev/null
+++ b/dev-python/pypy/files/2.0-encoder-3655afd07f2f.patch
@@ -0,0 +1,325 @@
+# HG changeset patch
+# User Brian Kearns <bdkearns@gmail.com>
+# Date 1360472826 18000
+# Node ID 3655afd07f2fe7e3e7c9f1a94d82fcc0a79fc51a
+# Parent  8556098ab5f036e9ded2549db6989e1206e28f45
+mangle pypy's non-standard JSONEncoder modifications to avoid namespace clashes
+
+diff -r 8556098ab5f036e9ded2549db6989e1206e28f45 -r 3655afd07f2fe7e3e7c9f1a94d82fcc0a79fc51a lib-python/2.7/json/encoder.py
+--- a/lib-python/2.7/json/encoder.py	Sat Feb 09 23:27:51 2013 -0500
++++ b/lib-python/2.7/json/encoder.py	Sun Feb 10 00:07:06 2013 -0500
+@@ -138,16 +138,16 @@
+         self.skipkeys = skipkeys
+         self.ensure_ascii = ensure_ascii
+         if ensure_ascii:
+-            self.encoder = raw_encode_basestring_ascii
++            self.__encoder = raw_encode_basestring_ascii
+         else:
+-            self.encoder = raw_encode_basestring
++            self.__encoder = raw_encode_basestring
+         if encoding != 'utf-8':
+-            orig_encoder = self.encoder
++            orig_encoder = self.__encoder
+             def encoder(o):
+                 if isinstance(o, str):
+                     o = o.decode(encoding)
+                 return orig_encoder(o)
+-            self.encoder = encoder
++            self.__encoder = encoder
+         self.check_circular = check_circular
+         self.allow_nan = allow_nan
+         self.sort_keys = sort_keys
+@@ -193,10 +193,10 @@
+             builder = StringBuilder()
+         else:
+             builder = UnicodeBuilder()
+-        self._encode(o, markers, builder, 0)
++        self.__encode(o, markers, builder, 0)
+         return builder.build()
+ 
+-    def _emit_indent(self, builder, _current_indent_level):
++    def __emit_indent(self, builder, _current_indent_level):
+         if self.indent is not None:
+             _current_indent_level += 1
+             newline_indent = '\n' + (' ' * (self.indent *
+@@ -207,15 +207,15 @@
+             separator = self.item_separator
+         return separator, _current_indent_level
+ 
+-    def _emit_unindent(self, builder, _current_indent_level):
++    def __emit_unindent(self, builder, _current_indent_level):
+         if self.indent is not None:
+             builder.append('\n')
+             builder.append(' ' * (self.indent * (_current_indent_level - 1)))
+ 
+-    def _encode(self, o, markers, builder, _current_indent_level):
++    def __encode(self, o, markers, builder, _current_indent_level):
+         if isinstance(o, basestring):
+             builder.append('"')
+-            builder.append(self.encoder(o))
++            builder.append(self.__encoder(o))
+             builder.append('"')
+         elif o is None:
+             builder.append('null')
+@@ -226,46 +226,46 @@
+         elif isinstance(o, (int, long)):
+             builder.append(str(o))
+         elif isinstance(o, float):
+-            builder.append(self._floatstr(o))
++            builder.append(self.__floatstr(o))
+         elif isinstance(o, (list, tuple)):
+             if not o:
+                 builder.append('[]')
+                 return
+-            self._encode_list(o, markers, builder, _current_indent_level)
++            self.__encode_list(o, markers, builder, _current_indent_level)
+         elif isinstance(o, dict):
+             if not o:
+                 builder.append('{}')
+                 return
+-            self._encode_dict(o, markers, builder, _current_indent_level)
++            self.__encode_dict(o, markers, builder, _current_indent_level)
+         else:
+-            self._mark_markers(markers, o)
++            self.__mark_markers(markers, o)
+             res = self.default(o)
+-            self._encode(res, markers, builder, _current_indent_level)
+-            self._remove_markers(markers, o)
++            self.__encode(res, markers, builder, _current_indent_level)
++            self.__remove_markers(markers, o)
+             return res
+ 
+-    def _encode_list(self, l, markers, builder, _current_indent_level):
+-        self._mark_markers(markers, l)
++    def __encode_list(self, l, markers, builder, _current_indent_level):
++        self.__mark_markers(markers, l)
+         builder.append('[')
+         first = True
+-        separator, _current_indent_level = self._emit_indent(builder,
++        separator, _current_indent_level = self.__emit_indent(builder,
+                                                       _current_indent_level)
+         for elem in l:
+             if first:
+                 first = False
+             else:
+                 builder.append(separator)
+-            self._encode(elem, markers, builder, _current_indent_level)
++            self.__encode(elem, markers, builder, _current_indent_level)
+             del elem # XXX grumble
+-        self._emit_unindent(builder, _current_indent_level)
++        self.__emit_unindent(builder, _current_indent_level)
+         builder.append(']')
+-        self._remove_markers(markers, l)
++        self.__remove_markers(markers, l)
+ 
+-    def _encode_dict(self, d, markers, builder, _current_indent_level):
+-        self._mark_markers(markers, d)
++    def __encode_dict(self, d, markers, builder, _current_indent_level):
++        self.__mark_markers(markers, d)
+         first = True
+         builder.append('{')
+-        separator, _current_indent_level = self._emit_indent(builder,
++        separator, _current_indent_level = self.__emit_indent(builder,
+                                                          _current_indent_level)
+         if self.sort_keys:
+             items = sorted(d.items(), key=lambda kv: kv[0])
+@@ -282,7 +282,7 @@
+             # JavaScript is weakly typed for these, so it makes sense to
+             # also allow them.  Many encoders seem to do something like this.
+             elif isinstance(key, float):
+-                key = self._floatstr(key)
++                key = self.__floatstr(key)
+             elif key is True:
+                 key = 'true'
+             elif key is False:
+@@ -296,15 +296,15 @@
+             else:
+                 raise TypeError("key " + repr(key) + " is not a string")
+             builder.append('"')
+-            builder.append(self.encoder(key))
++            builder.append(self.__encoder(key))
+             builder.append('"')
+             builder.append(self.key_separator)
+-            self._encode(v, markers, builder, _current_indent_level)
++            self.__encode(v, markers, builder, _current_indent_level)
+             del key
+             del v # XXX grumble
+-        self._emit_unindent(builder, _current_indent_level)
++        self.__emit_unindent(builder, _current_indent_level)
+         builder.append('}')
+-        self._remove_markers(markers, d)
++        self.__remove_markers(markers, d)
+ 
+     def iterencode(self, o, _one_shot=False):
+         """Encode the given object and yield each string
+@@ -320,9 +320,9 @@
+             markers = {}
+         else:
+             markers = None
+-        return self._iterencode(o, markers, 0)
++        return self.__iterencode(o, markers, 0)
+ 
+-    def _floatstr(self, o):
++    def __floatstr(self, o):
+         # Check for specials.  Note that this type of test is processor
+         # and/or platform-specific, so do tests which don't depend on the
+         # internals.
+@@ -343,21 +343,21 @@
+ 
+         return text
+ 
+-    def _mark_markers(self, markers, o):
++    def __mark_markers(self, markers, o):
+         if markers is not None:
+             if id(o) in markers:
+                 raise ValueError("Circular reference detected")
+             markers[id(o)] = None
+ 
+-    def _remove_markers(self, markers, o):
++    def __remove_markers(self, markers, o):
+         if markers is not None:
+             del markers[id(o)]
+ 
+-    def _iterencode_list(self, lst, markers, _current_indent_level):
++    def __iterencode_list(self, lst, markers, _current_indent_level):
+         if not lst:
+             yield '[]'
+             return
+-        self._mark_markers(markers, lst)
++        self.__mark_markers(markers, lst)
+         buf = '['
+         if self.indent is not None:
+             _current_indent_level += 1
+@@ -375,7 +375,7 @@
+             else:
+                 buf = separator
+             if isinstance(value, basestring):
+-                yield buf + '"' + self.encoder(value) + '"'
++                yield buf + '"' + self.__encoder(value) + '"'
+             elif value is None:
+                 yield buf + 'null'
+             elif value is True:
+@@ -385,17 +385,17 @@
+             elif isinstance(value, (int, long)):
+                 yield buf + str(value)
+             elif isinstance(value, float):
+-                yield buf + self._floatstr(value)
++                yield buf + self.__floatstr(value)
+             else:
+                 yield buf
+                 if isinstance(value, (list, tuple)):
+-                    chunks = self._iterencode_list(value, markers,
++                    chunks = self.__iterencode_list(value, markers,
+                                                    _current_indent_level)
+                 elif isinstance(value, dict):
+-                    chunks = self._iterencode_dict(value, markers,
++                    chunks = self.__iterencode_dict(value, markers,
+                                                    _current_indent_level)
+                 else:
+-                    chunks = self._iterencode(value, markers,
++                    chunks = self.__iterencode(value, markers,
+                                               _current_indent_level)
+                 for chunk in chunks:
+                     yield chunk
+@@ -403,13 +403,13 @@
+             _current_indent_level -= 1
+             yield '\n' + (' ' * (self.indent * _current_indent_level))
+         yield ']'
+-        self._remove_markers(markers, lst)
++        self.__remove_markers(markers, lst)
+ 
+-    def _iterencode_dict(self, dct, markers, _current_indent_level):
++    def __iterencode_dict(self, dct, markers, _current_indent_level):
+         if not dct:
+             yield '{}'
+             return
+-        self._mark_markers(markers, dct)
++        self.__mark_markers(markers, dct)
+         yield '{'
+         if self.indent is not None:
+             _current_indent_level += 1
+@@ -431,7 +431,7 @@
+             # JavaScript is weakly typed for these, so it makes sense to
+             # also allow them.  Many encoders seem to do something like this.
+             elif isinstance(key, float):
+-                key = self._floatstr(key)
++                key = self.__floatstr(key)
+             elif key is True:
+                 key = 'true'
+             elif key is False:
+@@ -448,10 +448,10 @@
+                 first = False
+             else:
+                 yield item_separator
+-            yield '"' + self.encoder(key) + '"'
++            yield '"' + self.__encoder(key) + '"'
+             yield self.key_separator
+             if isinstance(value, basestring):
+-                yield '"' + self.encoder(value) + '"'
++                yield '"' + self.__encoder(value) + '"'
+             elif value is None:
+                 yield 'null'
+             elif value is True:
+@@ -461,16 +461,16 @@
+             elif isinstance(value, (int, long)):
+                 yield str(value)
+             elif isinstance(value, float):
+-                yield self._floatstr(value)
++                yield self.__floatstr(value)
+             else:
+                 if isinstance(value, (list, tuple)):
+-                    chunks = self._iterencode_list(value, markers,
++                    chunks = self.__iterencode_list(value, markers,
+                                                    _current_indent_level)
+                 elif isinstance(value, dict):
+-                    chunks = self._iterencode_dict(value, markers,
++                    chunks = self.__iterencode_dict(value, markers,
+                                                    _current_indent_level)
+                 else:
+-                    chunks = self._iterencode(value, markers,
++                    chunks = self.__iterencode(value, markers,
+                                               _current_indent_level)
+                 for chunk in chunks:
+                     yield chunk
+@@ -478,11 +478,11 @@
+             _current_indent_level -= 1
+             yield '\n' + (' ' * (self.indent * _current_indent_level))
+         yield '}'
+-        self._remove_markers(markers, dct)
++        self.__remove_markers(markers, dct)
+ 
+-    def _iterencode(self, o, markers, _current_indent_level):
++    def __iterencode(self, o, markers, _current_indent_level):
+         if isinstance(o, basestring):
+-            yield '"' + self.encoder(o) + '"'
++            yield '"' + self.__encoder(o) + '"'
+         elif o is None:
+             yield 'null'
+         elif o is True:
+@@ -492,19 +492,19 @@
+         elif isinstance(o, (int, long)):
+             yield str(o)
+         elif isinstance(o, float):
+-            yield self._floatstr(o)
++            yield self.__floatstr(o)
+         elif isinstance(o, (list, tuple)):
+-            for chunk in self._iterencode_list(o, markers,
++            for chunk in self.__iterencode_list(o, markers,
+                                                _current_indent_level):
+                 yield chunk
+         elif isinstance(o, dict):
+-            for chunk in self._iterencode_dict(o, markers,
++            for chunk in self.__iterencode_dict(o, markers,
+                                                _current_indent_level):
+                 yield chunk
+         else:
+-            self._mark_markers(markers, o)
++            self.__mark_markers(markers, o)
+             obj = self.default(o)
+-            for chunk in self._iterencode(obj, markers,
++            for chunk in self.__iterencode(obj, markers,
+                                           _current_indent_level):
+                 yield chunk
+-            self._remove_markers(markers, o)
++            self.__remove_markers(markers, o)
+
diff --git a/dev-python/pypy/pypy-2.0_beta1.ebuild b/dev-python/pypy/pypy-2.0_beta1.ebuild
index f9722233794d..fe2d69c929b8 100644
--- a/dev-python/pypy/pypy-2.0_beta1.ebuild
+++ b/dev-python/pypy/pypy-2.0_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0_beta1.ebuild,v 1.4 2013/02/17 22:45:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.0_beta1.ebuild,v 1.5 2013/02/21 15:25:39 idella4 Exp $
 
 EAPI=5
 
@@ -43,7 +43,8 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/1.9-scripts-location.patch"
 	epatch "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch"
-	epatch "${FILESDIR}/2.0-distutils-fix_handling_of_executables_and_flags.patch"
+	epatch "${FILESDIR}/2.0-distutils-fix_handling_of_executables_and_flags.patch" \
+		"${FILESDIR}"/2.0-encoder-3655afd07f2f.patch
 
 	# The following is Gentoo-specific.
 	epatch "${FILESDIR}/2.0-no-static-hack.patch"