Fix UnicodeDecodeError in setup.py. Bug 410725.

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

4 files changed, 38 insertions, 9 deletions

diff --git a/dev-python/python-dateutil/ChangeLog b/dev-python/python-dateutil/ChangeLog
index 3611e7132aaf..4175190055d2 100644
--- a/dev-python/python-dateutil/ChangeLog
+++ b/dev-python/python-dateutil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-dateutil
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/ChangeLog,v 1.37 2012/04/01 17:27:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/ChangeLog,v 1.38 2012/04/04 02:54:29 floppym Exp $
+
+  04 Apr 2012; Mike Gilbert <floppym@gentoo.org>
+  +files/python-dateutil-2.1-open-utf-8.patch, python-dateutil-2.1.ebuild:
+  Fix UnicodeDecodeError in setup.py. Bug 410725.
 
   01 Apr 2012; Mike Gilbert <floppym@gentoo.org> python-dateutil-2.1.ebuild:
   Update HOMEPAGE.
diff --git a/dev-python/python-dateutil/Manifest b/dev-python/python-dateutil/Manifest
index 934a85baf908..d7541d4da04c 100644
--- a/dev-python/python-dateutil/Manifest
+++ b/dev-python/python-dateutil/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX python-dateutil-1.4.1-locale.patch 532 RMD160 77146aa3d872a5631c2dec89d39514665591ebea SHA1 63430bda467a60e4e949c2757a01eabe63332631 SHA256 15583bb1e7edb42c1ea107b146b1a17259e876cc5006a342ddb95d630637671d
+AUX python-dateutil-2.1-open-utf-8.patch 554 RMD160 5124f260110cd90a70a235f40c35891dea52424b SHA1 e562f6f215576f6e31fd8be008a2a37fb4513cab SHA256 8c634055a700ffa05b8b3df574baa88557e8dfcc187fa84f3fc7bc9e11241617
 DIST python-dateutil-1.5.tar.gz 232384 RMD160 5f7c80ec9bf68f1708213596a994130964e91e52 SHA1 f489e1a70e415731d401422f711670288571040b SHA256 c08aca7d85f8f8eed61e83b3423b829262c596a9a78f7ca3de0bcee2217d0e3b
 DIST python-dateutil-2.1.tar.gz 152334 RMD160 032cd363aec9e14f4b12bf1cc58eba213cd3147d SHA1 f0de3003c346b5fb210b42233d4f71298d23826d SHA256 4c44ec3f9ff057b8c7b4c78beca5fdd8710600ea9a1df42f31bfcbae2f059dee
 EBUILD python-dateutil-1.5.ebuild 1560 RMD160 49a483f089ea7cc20ea6d885f4551934cef6cabf SHA1 abbed2a45cb49a1565e14c9678f02737bf5823e5 SHA256 7124e48161612355598e90de5fef0571b1ece6ebad838a54194aadad723a9d53
-EBUILD python-dateutil-2.1.ebuild 1536 RMD160 246415869d1981fdf6e3ac69eb4431673002348e SHA1 8f88485a7bb307d25c92a8f7d12f5cc86e6dd4e6 SHA256 c52b0d71aba94cc3ba34a3abedec9df8dd100c652fc4af9cbb227b69c883a0ad
-MISC ChangeLog 5142 RMD160 1268ac23401961fe862e9a8c1115bb510960824f SHA1 c0a3ff3d016ca2c59e3ff677216f86ce479203ed SHA256 4317cea51976333f32597a2ce662cd2dfc5033bfc03c56b96ad82a066c55aff4
+EBUILD python-dateutil-2.1.ebuild 1603 RMD160 d8723a56b04bf25a07c63a40bb4e60649f212c1e SHA1 4c0a7cc037a63936552b68d1ec7b183f86b53d4a SHA256 918940e2dc70c6fcab53eb8c7f1deb2b102b60e9d5b77aca3b2938f8a9d26a1e
+MISC ChangeLog 5317 RMD160 1808e6b2e3301f1bd1526db1e8d1a5a4d1e029fd SHA1 a33b9f0817df4cffc3791b38713202087c05a517 SHA256 db64c23452e1d3fd6a920e2da6a6e3f623ef2fa78f3e44147e194a5df587e8d1
 MISC metadata.xml 321 RMD160 a4032f38afe72e05418ce030fe0144c44f6efa50 SHA1 2b6e67f28acd888380da9a608f65133ec8427602 SHA256 bc09a8d19122457f72a5cc7b348a41f4208b8c89d32cd20bfe0d39bb71630df3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk94j/oACgkQC77qH+pIQ6RVYwEAh2sn/LsL+Mnu8SuexTEj9Rff
-CfgL/0BYDpc259espn4A+wTJ+UI8A9puoTx4G/6rcA90amBgiyDiJiHg3+BHrnqC
-=kPK2
+iF4EAREIAAYFAk97t+sACgkQC77qH+pIQ6Rt8QD/SPrMPxL+zIxwpgJ291ZMNcm3
+4vua2nx5tVgiBo1pZHwBALh9IC4l1dxCMTCF26gk8/FgWFxkuR7syTHkDejhRA7b
+=bPjI
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-dateutil/files/python-dateutil-2.1-open-utf-8.patch b/dev-python/python-dateutil/files/python-dateutil-2.1-open-utf-8.patch
new file mode 100644
index 000000000000..f27285428784
--- /dev/null
+++ b/dev-python/python-dateutil/files/python-dateutil-2.1-open-utf-8.patch
@@ -0,0 +1,21 @@
+Fix UnicodeDecodeError in setup.py.
+
+https://bugs.gentoo.org/show_bug.cgi?id=410725
+--- setup.py
++++ setup.py
+@@ -1,5 +1,6 @@
+ #!/usr/bin/python
+ from os.path import isfile, join
++import codecs
+ import glob
+ import os
+ import re
+@@ -13,7 +14,7 @@
+ 
+ TOPDIR = os.path.dirname(__file__) or "."
+ VERSION = re.search('__version__ = "([^"]+)"',
+-                    open(TOPDIR + "/dateutil/__init__.py").read()).group(1)
++                    codecs.open(TOPDIR + "/dateutil/__init__.py", encoding='utf-8').read()).group(1)
+ 
+ 
+ setup(name="python-dateutil",
diff --git a/dev-python/python-dateutil/python-dateutil-2.1.ebuild b/dev-python/python-dateutil/python-dateutil-2.1.ebuild
index 324ece27951a..5f006f9d14e4 100644
--- a/dev-python/python-dateutil/python-dateutil-2.1.ebuild
+++ b/dev-python/python-dateutil/python-dateutil-2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.1.ebuild,v 1.2 2012/04/01 17:27:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-dateutil/python-dateutil-2.1.ebuild,v 1.3 2012/04/04 02:54:29 floppym Exp $
 
 EAPI="4"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="2.5 *-pypy-*"
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Extensions to the standard Python datetime module"
 HOMEPAGE="https://launchpad.net/dateutil http://pypi.python.org/pypi/python-dateutil"
@@ -27,7 +27,8 @@ DOCS="NEWS README"
 PYTHON_MODNAME="dateutil"
 
 src_prepare() {
-	distutils_src_prepare
+	# Bug 410725.
+	epatch "${FILESDIR}/${P}-open-utf-8.patch"
 
 	# Use zoneinfo in /usr/share/zoneinfo.
 	sed -i -e "s/zoneinfo.gettz/gettz/g" test.py || die
@@ -35,6 +36,8 @@ src_prepare() {
 	# Fix parsing of date in non-English locales.
 	sed -e 's/subprocess.getoutput("date")/subprocess.getoutput("LC_ALL=C date")/' \
 		-i example.py || die
+
+	distutils_src_prepare
 }
 
 src_test() {