Fix unicode error in setup.py, bug 495118.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 54 insertions, 12 deletions

diff --git a/dev-python/routes/ChangeLog b/dev-python/routes/ChangeLog
index 700f3cf1ed9b..ad180e1a1a73 100644
--- a/dev-python/routes/ChangeLog
+++ b/dev-python/routes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/routes
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/ChangeLog,v 1.18 2013/11/21 20:53:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/ChangeLog,v 1.19 2013/12/25 16:01:31 floppym Exp $
+
+  25 Dec 2013; Mike Gilbert <floppym@gentoo.org>
+  +files/routes-2.0-setup.py.patch, routes-2.0.ebuild:
+  Fix unicode error in setup.py, bug 495118.
 
 *routes-2.0 (21 Nov 2013)
 
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 2ff4c7e34b58..ed8579fd5a3c 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX routes-2.0-setup.py.patch 1068 SHA256 67494c1b57466627d460d3c348ce6219eb0706542e7ef6dbdecc3b8f7db28aab SHA512 7c5f44715e332689b2f41b02e7398ec513d0e9436b3f6cf5ab17a673ac9993cec0ff5bdcaad6869a2eb66f0ba32f4b0c29936a052701cef1bf18b8be4f354a10 WHIRLPOOL c0693412d64670ba81cefbd66f373e2dc79150208f553795f0550330902485cb83724c5d2f584d806682a5dc81779058113786762e4da5be2a022d35b6266e08
 AUX routes-2.0-tests-py3.patch 2261 SHA256 9077ebe17ca7f405b806356ccea9ca2a3e83f252ec7c347563375759ee604a7c SHA512 23f49438792daf8302e77a2b2a228c06ff4ecc982580b844dbfde59492b5a1c558155fa06467158f9ac9ae357db11d8f08c154db065c1a9cb6e1443042e3f05f WHIRLPOOL 8427e7e31b308f1eb2989cf6e8b5f49b5c73628ff072c37d54310537f51d4c4a1a970a14bf68b446b72be5bbbad7a6f2c74a81afbfe84bab379bcfb375721f20
 DIST Routes-1.12.3.tar.gz 799601 SHA256 eacc0dfb7c883374e698cebaa01a740d8c78d364b6e7f3df0312de042f77aa36 SHA512 682fa544b1e5ac2983b8b1e80c9806ab87bd82be49dc7521ac9368e6646405348f772b42bf753727c18225b4205147c034e564d99527856469727cdd198b81d0 WHIRLPOOL b035e20627ccc94d6ae8190ba528e5e60a074b6471fdba1c797af6f04c68f28a415b662443fa6c26221f5811a1c33a14d85eb3cc40665fd18cc81f64deab1648
 DIST Routes-1.13.tar.gz 797539 SHA256 cc03d1a357cdb7af82e3909ee8ff93cb2b2afb48aca23bfde0117d6f49f624a7 SHA512 052b04e0ee803394ffe1675a075fb633e790fdcabf1ee012a73d0c4ef211b4d0b18be13f680537fe5f8424193245d0b4bb2d76a20b9e74707e73b25e076a9f6a WHIRLPOOL 7b83a24719ca2e051f9ba44ca712c10c2eca1590e1fc39afb731777de9c9bd73af4ef99868bf1e3dfa688ff38b9068f30311fe146973d9b55e1c61c501a08ebb
@@ -9,17 +10,13 @@ EBUILD routes-1.12.3-r1.ebuild 960 SHA256 b785cf9088d4659763de06efd2ba58815c1a0b
 EBUILD routes-1.12.3.ebuild 1051 SHA256 6dd6f837ef8918c258a60c88cc91cf0dcbd5f3b3ef2478f1a54f991d7b3474aa SHA512 0e43f4ffc3ebe6fd4f2f39562fd79a0c8f4a7ea51ea5a3232d5d5a0d7e926c21ab9991bbc7d365ace4c588553da7310880459de083b9041fcee97566e5370f72 WHIRLPOOL e50c87488a86c291f99faf9953ad86fe6204536c749f4b3654a807453deaa9e7e2192ae6cd4ffbb2b0ccb64a11f38fddc9bc37f73a3b5e55396c072ebc01569a
 EBUILD routes-1.13-r1.ebuild 1217 SHA256 9820759ce783f0238b3406992a024ae8a7aec1dd1d9d525f6c4dc8cb4a36c868 SHA512 18e730b4fd9d83ee2ab026bfcd3e0a8a197e291ed99062ddea925d7b0ff4e93da197b66eb0b28fe574e1fd0dc29e7d72119e1cfa62852ce44b5113bc1c3976cd WHIRLPOOL e8cd16cbdd9b798cac6443e07ff31c7a4a30dbcfb924d49c086466062061f6cc4e47e7c900b917ce0430936db3ef837e022cfbbce091992bf7f5f011e7ec5e75
 EBUILD routes-1.13.ebuild 1112 SHA256 083726f92e28141dab14ac5a7c9a6744d68907dcddff7cd15f5820838047697a SHA512 52cf5d0ca878fe50b5bebb2da30fc4f9a6984b728ed52fac5ffb862946d7edf439f3acdcca3ea7b2ee0b62a754d717a7626db821a827a632d463ba77b23751e7 WHIRLPOOL 821eb7ae4a1cad9b4e6895ec7de6437c9fb63e0e07d76cdc47d3a0b675bd7657897e38e736303d77fc59868bdaa07a29af07d2c6b5484b49baad23c7d57b059c
-EBUILD routes-2.0.ebuild 1582 SHA256 8eaa24df0dd46edd3f90b58909776d2092e1a60fedef314219a0238a6d0628a0 SHA512 4849855bd07e2e08d2a492456bcc4ceb1b3f04376aaf1643d0c00c3aab7e0a8af1a2339a37f9fc79e3f28be44aae56d5ed89214bacccaab91499e235a07d24f3 WHIRLPOOL 696bf7f21ca6ce62d03083a3553dd27233191f4d06bb1db70628b2f4b2926b5b3d5bbb0354d81e2d737165bed009786f9ddd56210aefaa41f9e367a7aaf9d73f
-MISC ChangeLog 2979 SHA256 fa6fcd16f46c5a593ad3c30210b9c587a5d5111ccedcaa649e1cb0cf006f9dc7 SHA512 1cd6897d7d04fcb254b11c7d2659d8121fef3f7d202600b1527208b3bc452dbbc9d34899220d400bf0771032c8cbb5e9ab3fc59ec8e8b9f8a38c7adefe69633d WHIRLPOOL 32a88b00344bf05ff8c9df83b4f01a555111c70afe1f5258864b6fe93333a3b818feb00980b9e3282c6828cbbeec4a30c0afa53898b816a768eab2ba786ea5e4
+EBUILD routes-2.0.ebuild 1621 SHA256 ec994b0cd621870c0671ea07f96c4e8cd4b66dc818411ad685fde6ecf2096099 SHA512 5b131f58023f1d1749c26531ae85e8771b6681c40d3e2ac0b761c237214a51dd15638d4c74fce054c0349ca5925915bb0e005c5e91ed3bb8079e164c06ca39c3 WHIRLPOOL 282e8631b4edf95669cdee06a0ed7ba0fe2f024a7047cad904fde9bd959417d2dc8ebb135de124641ce11f8b8069dcbcbef0268650ce677303f0aa827f64529b
+MISC ChangeLog 3127 SHA256 cf034e6736528a18cd646e160f2302b704ffd15f063fba763ef80dcd28963df5 SHA512 87b14b635fa4a68be1761c4ef9b9f863a9b1ce54e6c2e137245ad1284b0f3fbe6f4b947e13a0d7e048bfe2b4025d05b79c9968aa9c179ad0ee13e761e2aaef5d WHIRLPOOL 1ba528ca6d9c277a07704e43cfc52830415b59987cbcf2f8be096c8ced601b498d03416d07fb875e39f84647be217d2c15f81ae2e4c8dd19e3d72c3c5e7fbcc5
 MISC metadata.xml 229 SHA256 dfa0cf150e448f373a15e09b7134990e29a65e6b35c53ae8773dedc89825371e SHA512 421ce7c4735ff92b9784a9b79fad6f71cf8d9bc46ae064f3b32fd85fff896781fc12fdc9a1562e28966e6e215d05ac470825748ba6905df4bd684462de9a90e6 WHIRLPOOL e284e64d0d34aac2b76e895fa25fdc20a066c58c2d59b2bd2f2062ec783622b1eca6c6ddb24ddcae157e90fcd4c7b8735be8166d03bfe49d468625eedc1915a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSjnLqAAoJEEqz6FtPBkyjjgoH/As2OAPMu38FJr8+ZhAdRVm8
-Zp5+ZqeuAhMsdkQEPFWfTdVQJfssKDQmBGO8LwTurVQy+qLtGGCKcaqSBGFc4vF6
-6tAawRDj2wZubVPHNCgP/bqWO2Ffd3mjr3jWTWU+PPt/7oUXBCCwO+Pp5COQA9Pn
-Fg/5ENw/mOgp/O6wRJnQLOO8nbR0/7blGBrgQlcHm5DPqCzvkiSlOS7oN65UbJDr
-iGfIaCbz1QTtrbbIOpL19SrR77sHTiF7BPwDDbW1KPwhc3nQxwsb6/QqIpXtHsDl
-7XV1WKztZr0Bcm4teHgDkyZ6W6OR874LBTRGM4arl3HIrXI7WWzU+xFzT97VkMk=
-=S4a/
+iF4EAREIAAYFAlK7AVwACgkQC77qH+pIQ6RI2gD/REsTpLYp+YID7Oa+rayy8cdC
+wKiiFXYRxmVCM5OIhhoBALzOCSw49YIJ59Fx39qtS6gVNhwEC7Mpoa+67TjOWt1Y
+=TARB
 -----END PGP SIGNATURE-----
diff --git a/dev-python/routes/files/routes-2.0-setup.py.patch b/dev-python/routes/files/routes-2.0-setup.py.patch
new file mode 100644
index 000000000000..ec090f42fce5
--- /dev/null
+++ b/dev-python/routes/files/routes-2.0-setup.py.patch
@@ -0,0 +1,38 @@
+From 414ba660bccd3eed60f63cc8a1d117740065126f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Wed, 25 Dec 2013 10:42:26 -0500
+Subject: [PATCH] Specify encoding when opening files in setup.py
+
+This resolves a UnicodeDecodeError when setup.py is invoked with a
+non-utf8 locale.
+
+https://bugs.gentoo.org/show_bug.cgi?id=495118
+---
+ setup.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index c76e869..9191f11 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1,12 +1,14 @@
+ __version__ = '2.0'
+ 
+-import os, sys
++import io, os, sys
+ 
+ from setuptools import setup, find_packages
+ 
+ here = os.path.abspath(os.path.dirname(__file__))
+-README = open(os.path.join(here, 'README.rst')).read()
+-CHANGES = open(os.path.join(here, 'CHANGELOG.rst')).read()
++with io.open(os.path.join(here, 'README.rst'), encoding='utf8') as f:
++    README = f.read()
++with io.open(os.path.join(here, 'CHANGELOG.rst'), encoding='utf8') as f:
++    CHANGES = f.read()
+ PY3 = sys.version_info[0] == 3
+ 
+ extra_options = {
+-- 
+1.8.5.2
+
diff --git a/dev-python/routes/routes-2.0.ebuild b/dev-python/routes/routes-2.0.ebuild
index e95900ff3fb5..40aa2bb064e6 100644
--- a/dev-python/routes/routes-2.0.ebuild
+++ b/dev-python/routes/routes-2.0.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/routes/routes-2.0.ebuild,v 1.1 2013/11/21 20:53:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/routes/routes-2.0.ebuild,v 1.2 2013/12/25 16:01:31 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -32,7 +32,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}"/${PN}-2.0-tests-py3.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0-tests-py3.patch
+	"${FILESDIR}"/${PN}-2.0-setup.py.patch
+)
 
 python_prepare_all() {
 	use test && DISTUTILS_IN_SOURCE_BUILD=1