Fix compatibility with Python 3.2 (bug #351063).

Package-Manager: portage-2.2.0_alpha29_p10/cvs/Linux x86_64

5 files changed, 99 insertions, 6 deletions

diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index 9a23e03a2006..26ddeac5a566 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/docutils
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.126 2010/12/27 21:59:46 arfrever Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.127 2011/04/09 23:56:44 arfrever Exp $
+
+  09 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  docutils-0.7.ebuild, +files/docutils-0.7-python-3.2-configparser.patch,
+  +files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch:
+  Fix compatibility with Python 3.2 (bug #351063).
 
   27 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -docutils-0.6.ebuild:
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 5b32c047c0e4..dbcc639cb366 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX docutils-0.6-extra_modules.patch 828 RMD160 d17b6dec432f879e6d387c20f87a207ecf069653 SHA1 0b5a2165e50f9f6876811a12c0c833e8f168e3e2 SHA256 782351307ed68162399e51b0fe6412d931a791e5e9b7f454ea345b9ba8260133
+AUX docutils-0.7-python-3.2-configparser.patch 1708 RMD160 c6599bc9d1742b175391b89ac53ff924536a6d09 SHA1 ba31ff30ace8c27b0c50a3251e77ed0968039439 SHA256 06938cdb53da6a41c5d07a1afeab386f202d12787a22cb1d1a46fa01200eb5d9
+AUX docutils-0.7-python-3.2-xml.etree.ElementTree.patch 380 RMD160 c08b32cdacea8e959646bb8f5439780253a8f3a5 SHA1 b5d89d521df0f52c224d80273ad6b3bad8877090 SHA256 4bcf5a0cd248f46b50cd2c3ebb5aa5b32c04a93a3d2dbed3546ff4c23c94df52
 DIST docutils-0.7.tar.gz 1404131 RMD160 73c832860405c3cba655c92aacccca1582c8f905 SHA1 e82988f826844ef8d8bf28fa286a19de211349cd SHA256 cd8dc8e131813af9f4f1963f719611cccf23749dcf703f944bb4ac434393ea03
 DIST glep-0.4-r1.tbz2 4667 RMD160 bea44f2fe567422fd42bedebdf04cb6d984478ae SHA1 123516118f8bb2c75296a125702f4bf8f3ff1959 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058
-EBUILD docutils-0.7.ebuild 4731 RMD160 e05cd7f952b59b18029d30fcc9f57bca7b76971e SHA1 17844f36df2bb2ed34651ff13914fc3564e1fbe4 SHA256 ef4d460f110e0d48bb64ee2450fe615a258a137f738f70b0190a31e85c266e1d
-MISC ChangeLog 18009 RMD160 3f088f732af4cb7f5d0f0effb3c178dc10a791e7 SHA1 b4f9696279bc8508a93161eaf2d96f9a0871c109 SHA256 24719fd22c549f6d279e40ae3e7c98ad2ed545b7e078c05a08fb7607de0cb83d
+EBUILD docutils-0.7.ebuild 4857 RMD160 3a5a7db16d3dd11e2678a1faf21e533bf7f526bc SHA1 2967eaf0f8579f89774bf62535f896d42a1adfa4 SHA256 9965f16b5feebad3c524dcc9decdc15692453a1c9bb431938fd207350744541d
+MISC ChangeLog 18270 RMD160 ab33a5d1a165260a89883fe604c2028cffca308f SHA1 aebdcc59a6d5d2c4dbcf968e4e8088f664e71ed2 SHA256 a5673dad51e6dae43148ae7c595185a0c1996f4174a621ecf9b83c5a462d74fa
 MISC metadata.xml 224 RMD160 37a2cf5db0ab817c0e2a1127e9cc4278bf88c904 SHA1 e2c1b45b839624cbc4bd949c8458d50dec01e7cb SHA256 0bb6bfd1577f4800009497c7813935f712ae6a44dbbdec1a903e79eaa5f21755
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNoPJQAAoJENgZr6v6gHY0m4UP/ijvGTJeNoLKTMhJEQ6/uYaZ
+iXLYcT2hvxlSCUSK7gN7tyHVAXJU/U3MMr4rLGZRIhYMWbUYNylCNUndj6jg42qC
+VVBqnh4vFsk33G1sV+y+l6LbopkmFVtpLbIjOmhyTZDL/Dg9UWc1TMw1vohxFdm3
+TbVtOpx4fKaMQ/CQfH9ppra2lNs+sh1xZTdDiZcIGDntMw4TjgcbrGmH/IzOm+2P
+ENi5lAPIPuf8cwJpquKOwmgUDpsnDe6cs1vWNzjyfDgqhc2RcCYT47l6yO0137lX
+0Yq2NoBWhguL5/CFHGtk1Svytq84ApUg5LVDybUa+nPNpJcaCl6U5FCrsthwApLW
+KC3XrkByDx/ylLI2PLwBU9hVpbNNjAK3koGQqiqCDurs9HJWnIonjvTduueb84o+
+QBQtCH/QNclOQicr3jwTXG0+IVaWjz5jJV8/ujnX/lhC1jKlzELoZonPGOk0ZqXE
+leSOFLo7uDUKA+m8piXSwXEfsg2IkQxr4d67XJ+S20WUl28xhX6WZOhus0VglbAe
+JVUeWSV+c7JJ8CZoJRDJoKuwEiWjqvaLKYj7+xjCFWfPVBmWUxA/MBKfspf8PMeM
+inGml2x2DSd6HVOZBvjiX1RYXp3foSMFqLPostg7S/ORAdv3nXZ3g4CarKffRMPJ
+nFasq2IcFmF+jTqe8r8Z
+=Psqq
+-----END PGP SIGNATURE-----
diff --git a/dev-python/docutils/docutils-0.7.ebuild b/dev-python/docutils/docutils-0.7.ebuild
index 14085c09631c..24a5178d5d8b 100644
--- a/dev-python/docutils/docutils-0.7.ebuild
+++ b/dev-python/docutils/docutils-0.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.7.ebuild,v 1.14 2010/12/27 21:07:26 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.7.ebuild,v 1.15 2011/04/09 23:56:44 arfrever Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -39,6 +39,9 @@ src_prepare() {
 	# Fix installation of extra modules.
 	epatch "${FILESDIR}/${PN}-0.6-extra_modules.patch"
 
+	epatch "${FILESDIR}/${P}-python-3.2-configparser.patch"
+	epatch "${FILESDIR}/${P}-python-3.2-xml.etree.ElementTree.patch"
+
 	sed -e "s/from distutils.core/from setuptools/" -i setup.py || die "sed setup.py failed"
 }
 
diff --git a/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch b/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch
new file mode 100644
index 000000000000..3f67f244cfd1
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.7-python-3.2-configparser.patch
@@ -0,0 +1,49 @@
+http://sourceforge.net/tracker/?func=detail&atid=422030&aid=3149845&group_id=38414
+
+--- docutils/frontend.py
++++ docutils/frontend.py
+@@ -671,7 +671,7 @@
+         raise KeyError('No option with dest == %r.' % dest)
+ 
+ 
+-class ConfigParser(CP.ConfigParser):
++class ConfigParser(CP.RawConfigParser):
+ 
+     old_settings = {
+         'pep_stylesheet': ('pep_html writer', 'stylesheet'),
+@@ -693,7 +693,7 @@
+ """
+ 
+     def __init__(self, *args, **kwargs):
+-        CP.ConfigParser.__init__(self, *args, **kwargs)
++        CP.RawConfigParser.__init__(self, *args, **kwargs)
+ 
+         self._files = []
+         """List of paths of configuration files read."""
+@@ -708,7 +708,7 @@
+             except IOError:
+                 continue
+             try:
+-                CP.ConfigParser.readfp(self, fp, filename)
++                CP.RawConfigParser.readfp(self, fp, filename)
+             except UnicodeDecodeError:
+                 sys.stderr.write(self.not_utf8_error % (filename, filename))
+                 fp.close()
+@@ -749,7 +749,7 @@
+                 except KeyError:
+                     continue
+                 if option.validator:
+-                    value = self.get(section, setting, raw=1)
++                    value = self.get(section, setting)
+                     try:
+                         new_value = option.validator(
+                             setting, value, option_parser,
+@@ -778,7 +778,7 @@
+         section_dict = {}
+         if self.has_section(section):
+             for option in self.options(section):
+-                section_dict[option] = self.get(section, option, raw=1)
++                section_dict[option] = self.get(section, option)
+         return section_dict
+ 
+ 
diff --git a/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch b/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch
new file mode 100644
index 000000000000..5268434577b7
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.7-python-3.2-xml.etree.ElementTree.patch
@@ -0,0 +1,14 @@
+--- docutils/writers/odf_odt/__init__.py
++++ docutils/writers/odf_odt/__init__.py
+@@ -300,7 +300,10 @@
+ 
+ def ToString(et):
+     outstream = StringIO.StringIO()
+-    et.write(outstream)
++    if sys.version_info >= (3, 2):
++        et.write(outstream, encoding="unicode")
++    else:
++        et.write(outstream)
+     s1 = outstream.getvalue()
+     outstream.close()
+     return s1