Fix UnicodeDecodeError in setup.py, bug 346001

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 38 insertions, 4 deletions

diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog
index 8a6c86681986..5a32485aabdd 100644
--- a/app-portage/gentoolkit/ChangeLog
+++ b/app-portage/gentoolkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/gentoolkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.198 2010/11/19 16:50:20 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.199 2010/11/19 20:24:24 fuzzyray Exp $
+
+  19 Nov 2010; Paul Varner <fuzzyray@gentoo.org>
+  +files/0.3.0_rc11-setup.py.patch, gentoolkit-0.3.0_rc11-r1.ebuild:
+  Fix UnicodeDecodeError in setup.py, bug 346001
 
   19 Nov 2010; Jeremy Olexa <darkside@gentoo.org>
   gentoolkit-0.3.0_rc11-r1.ebuild:
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 5978bf1bb784..9f5bf0b01ad4 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,11 +1,12 @@
 AUX 0.3.0_rc11-eshowkw_indir.patch 870 RMD160 be3da0ced1645a930190aa5b563b05ebbd791a89 SHA1 a589a81a65e96c050f7f85b34b246cf1a9f463dc SHA256 fac5774bf3b17a7d88cf8fd57cea70980e9dcd49b2a622c960de59302fb2793a
+AUX 0.3.0_rc11-setup.py.patch 805 RMD160 0b0eecdd8eeb9667cb33e82c3f94853f96aa8fb0 SHA1 07179a1dcfe47db7849ddc3bb44d0adde57df09f SHA256 b05d56a5c52e53fe8150ce8e4181e7b9684eaf51145747357ed82218b90cfed2
 AUX eclean.313901.patch 1497 RMD160 21579445342977fe59a7a464605c963a43c59fa7 SHA1 daefcf1dde3c70b04d0bf528b88335656b48fe61 SHA256 2e825cb0ddfafcf139b9ae31c232e1f4b6f8401ca25070fe47c6ab3a4312f7be
 DIST gentoolkit-0.2.4.6.1.tar.gz 90135 RMD160 7cfe8a8a6e697bbab0d93ec6d82f5b0aee8bcc03 SHA1 82e8a785a753a9e86063dd4fff2f4f864e4224bb SHA256 d057ce14e037e313ae085ac70871a56bbc147efe9beae8fcf8c818afcaa63896
 DIST gentoolkit-0.3.0_rc10.tar.gz 159126 RMD160 8cb87304ddb335892b4a9382fecbf365b4a8a716 SHA1 b3fa3eed17df600676ec1c3a0daa1510d3e2ab74 SHA256 ee274b16a374fcfd6c6a8fad774373fca483c58dc69bde324fdf98149c7a83a4
 DIST gentoolkit-0.3.0_rc11.tar.gz 167765 RMD160 65540c67ec0acf15652d6e8ece5e3421c345b82e SHA1 e0526dc43aad0203af129e09ea3a77d021f0e26c SHA256 a4c84e981a5d68c1945881ba0b5e6498ec259d5da3fe6132e413f8f821448e2a
 EBUILD gentoolkit-0.2.4.6.1-r1.ebuild 1937 RMD160 68dc2dc6316b50b4bf8e859703d8625a16c9bbd4 SHA1 d3d8a54fd904346a3135634e52cc1d28dcc98be2 SHA256 01d92295e18bd035c8cd20b400808ff45d2a5d3aa55d3146a68e00d5a4cb3346
 EBUILD gentoolkit-0.3.0_rc10-r1.ebuild 1959 RMD160 14316767553ed2cca032d6cc09185f8950ba3981 SHA1 da799cdba8564883cd598fc15b6dd9500e5d5792 SHA256 cca639a3aac964759bc451f4824b7f0267fcbc660c96dc6adb6197997f6d717e
-EBUILD gentoolkit-0.3.0_rc11-r1.ebuild 2524 RMD160 d0793f2483f3797c7127afeba0741d3303e78e25 SHA1 4c61c527768f36cf13d2b78352dd102a9725e804 SHA256 2063db90f5691e031ca537199d7b2a793d0a5f46b8e6a2a7df0c6e88b3f880c4
+EBUILD gentoolkit-0.3.0_rc11-r1.ebuild 2567 RMD160 982b0607304d3f4a6a8b4adada1a32f2baa8945d SHA1 ff7a37968e6bfa42dde29f748d1c90e9abfb626f SHA256 2e4f97ccb9ca24c43e48dcdfb610e28ee8ca30220843cf1273eaab5f96a54720
 EBUILD gentoolkit-9999.ebuild 2092 RMD160 cdf7d7da26bd0d163c2499ba098c8b4d56695bdc SHA1 e62825df3b28769f847538b9bdb5b95d3095919c SHA256 cd09017a13219e2ccbf1c6f159dae52db18c4142ba8f13617015d6ec797f85b4
-MISC ChangeLog 58008 RMD160 7ea73612e24f1c0a1dc964065fdb583d65cfa872 SHA1 68dadeb8344d04935eef6a6d77a54a786e18af1c SHA256 db3eb9932ad34222f0fe1a5dbacf5d70be1f1e5def9228c7e3b2902ae4833df6
+MISC ChangeLog 58176 RMD160 40586796cd7ad623aae839ea4641c530544497ed SHA1 37c7b832b88136da07d11ece1f6477947720355a SHA256 5af29014dc6390ad5ce02bc85300310626898069859ff21979a78a44b2ce0fe5
 MISC metadata.xml 451 RMD160 b1cce9123da273149c731793696937f9b3d02c60 SHA1 6126c34edcb6ed5f4274e060881378cc1cf10757 SHA256 1a2def4d28f69d6bffeb0b09e97ce53e6822e457d5d9308000a1010dca32abeb
diff --git a/app-portage/gentoolkit/files/0.3.0_rc11-setup.py.patch b/app-portage/gentoolkit/files/0.3.0_rc11-setup.py.patch
new file mode 100644
index 000000000000..b75e33280894
--- /dev/null
+++ b/app-portage/gentoolkit/files/0.3.0_rc11-setup.py.patch
@@ -0,0 +1,28 @@
+Index: setup.py
+===================================================================
+--- setup.py	(revision 857)
++++ setup.py	(working copy)
+@@ -10,6 +10,7 @@
+ from glob import glob
+ 
+ import os
++import io
+ 
+ sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym'))
+ 
+@@ -59,13 +60,13 @@
+ 		def sub(files, pattern):
+ 			for f in files:
+ 				updated_file = []
+-				with open(f) as s:
++				with io.open(f, 'r', 1, 'utf_8') as s:
+ 					for line in s:
+ 						newline = re.sub(pattern, '"%s"' % ver, line, 1)
+ 						if newline != line:
+ 							log.info("%s: %s" % (f, newline))
+ 						updated_file.append(newline)
+-				with open(f, 'w') as s:
++				with io.open(f, 'w', 1, 'utf_8') as s:
+ 					s.writelines(updated_file)
+ 		quote = r'[\'"]{1}'
+ 		bash_re = r'(?<=VERSION=)' + quote + '[^\'"]*' + quote
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild
index 4033b9f75952..d07d5cb317ad 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.2 2010/11/19 16:50:20 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.3 2010/11/19 20:24:24 fuzzyray Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -39,6 +39,7 @@ distutils_src_compile_pre_hook() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PV}-eshowkw_indir.patch"
+	epatch "${FILESDIR}/${PV}-setup.py.patch"
 }
 
 src_install() {