Make setup.py work in a non-utf8 locale (bug #430034, thanks to Flameeyes for reporting).

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

4 files changed, 40 insertions, 5 deletions

diff --git a/dev-python/doit/ChangeLog b/dev-python/doit/ChangeLog
index c2c124c884f4..78d7a2268bc5 100644
--- a/dev-python/doit/ChangeLog
+++ b/dev-python/doit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/doit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/doit/ChangeLog,v 1.1 2012/06/27 08:03:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/doit/ChangeLog,v 1.2 2012/08/29 10:22:38 marienz Exp $
+
+  29 Aug 2012; Marien Zwart <marienz@gentoo.org>
+  +files/doit-0.16.1-setup.py-encoding.patch, doit-0.16.1.ebuild:
+  Make setup.py work in a non-utf8 locale (bug #430034, thanks to Flameeyes for
+  reporting).
 
 *doit-0.16.1 (27 Jun 2012)
 
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 399b7657a965..ab120b8b141b 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX doit-0.16.1-setup.py-encoding.patch 486 SHA256 f325efab0cb35db71606d29c9955f256e00c80aa4ac8355a6c69596193d5723a SHA512 3be963571a9f26acb8b99a6b8e086ef7ca03587c39615a266d0e4674a1c0653c205265c53aafaa7bd2ea26d86913e27da1697b80b3a901ba05cc6c2c9402973d WHIRLPOOL 52e5eece0a13ff96ecc030ce83a16359d671281045579a60d0fedcad828683dc572fae6a6de3bab16d06fdc63110a5f99267bd6e19d758e62146758a06e4c47d
 DIST doit-0.16.1.tar.gz 279086 SHA256 02a36ae4efa7dd5ae3bff0799daa302653431b49c2b5a6b03ef12eae118aa704 SHA512 8e4ef8d8aa3f1b4f78f61d1feb769102bb816de1d178582f907e3ea894a5302e2f19314f159de5cd7180c590c15236260fa2ecb6cbeef1f5148b7901e14ef3d6 WHIRLPOOL 9b9a69efa2da7a4bd7dd67cc201f26fbbb4a5663590d5024e98e43c95f453d34c3d42422170509ac0f255c897b594893ad6748fcb02e6641affcc9d01178d2ca
-EBUILD doit-0.16.1.ebuild 699 SHA256 157b322bc85273fa6fe3145ce7190bbfcd9c1114f6ac99ace371e7d2ea079a54 SHA512 1a174fcb7fd37df6e1300925ae0f43517891b106e134e2d6ad22f474dd8dd48c703e2d48aa2b35ef983593b1f541cfd241ceecebe86fb469e3778f515bd93866 WHIRLPOOL a20fdbc76c4fb6e2ce220db212777d3970b837c0e748c8f41b30f67a4ad8aadf14b272d9039e66e5ea5837d145baf1f5d495a804f2d66dad5396194abceb765f
-MISC ChangeLog 370 SHA256 154f6044567ac86260181b5a8606fc2f5b8f71ff5c1d9382d604263b1359c201 SHA512 ec2d3e347d9ad7c1e674a8cf5f5e9638ce8a338e472093ec7fe606bfa45775af4034d9ba95e344658867eab3163ffbff5d28b1433c0745e920cb22038f11cd0b WHIRLPOOL ceb3b5a3e8ee00d44cfcbe356af17b6799362577f030f18db8ddf651ecc0e97a3c8f0dd99cfdceb868ac73f9dbeab310b45fc1af9b40f38a9920932953b549d2
+EBUILD doit-0.16.1.ebuild 818 SHA256 d78b4f8962ea6c5b34ec7cda291e8860f23c2939eeb159f1a899841fb8cd6444 SHA512 c0126452b81e5ebfa8b8b25029ed6a91cf16c2b72fd62bfe7bd1c726731b6b5969bf521b1ac5b6c9c044f66491d90bfea648ae534f8ee91ae188dc07024eae6c WHIRLPOOL 8c13269717fdbf436f2e0c75e17221c8d9bc1a6d080d38c2659c2f00508683c33f373204bda90c0dad7dff8e9d52bb84111470a1a0529f466a0de4c63631af01
+MISC ChangeLog 581 SHA256 ff29840fd1631d2ef083a49c6df09d7ed6e3b473ba03d44029cdc11c43c7c96a SHA512 ca4f3e65e6f93042045cb45297697cf7034f3950fe1170bf58f3d0620f26fd7c53c9610b603018f0131855cc55874d93aabc9ff53a96c05e4877430e97f5b278 WHIRLPOOL 391679565e652b896124bc96241eccfa74c7f4f03f3e75f15119ac6fcf64c71e823c101f240dfd94aabc41d0e5831e2e429b24cb90d1671c76476717492e49c7
 MISC metadata.xml 259 SHA256 3d6cf397ee3ffe54da22c27a1cc87794c6e81e4939bb95facd7a0cfb344d6c8f SHA512 8267c7aecd866ea7616a48a4ea006a8eac7b134c02ae996a7e9f690f465ac3a330984fb97f55bcc72f792faaaee4dff2178c7bd38fb8fb3796329c508899d900 WHIRLPOOL 1701b88f3ed993eaa67a14d457a7587c1a3dff0e750e2e897a0961c9618f09c5b49ed9e418b78e885bccdf1c83b03e2706133c7d624ff189e32b9834769217cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlA97SwACgkQUElL7eJpfETYMQCdE1yJYsvnjzpKXjkxsdriMTaC
+TVUAn0kNHeidlb6nhyUoTUsloYb46T+U
+=pXih
+-----END PGP SIGNATURE-----
diff --git a/dev-python/doit/doit-0.16.1.ebuild b/dev-python/doit/doit-0.16.1.ebuild
index db568acc005f..db8a018fd2d3 100644
--- a/dev-python/doit/doit-0.16.1.ebuild
+++ b/dev-python/doit/doit-0.16.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/doit/doit-0.16.1.ebuild,v 1.1 2012/06/27 08:03:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/doit/doit-0.16.1.ebuild,v 1.2 2012/08/29 10:22:38 marienz Exp $
 
 EAPI=4
 PYTHON_COMPAT="python2_6 python2_7 python3_2"
 
-inherit python-distutils-ng
+inherit eutils python-distutils-ng
 
 DESCRIPTION="Automation tool"
 HOMEPAGE="http://python-doit.sourceforge.net/ http://pypi.python.org/pypi/doit"
@@ -19,6 +19,12 @@ IUSE=""
 DEPEND=""
 RDEPEND="dev-python/pyinotify"
 
+src_prepare() {
+	epatch "${FILESDIR}/doit-0.16.1-setup.py-encoding.patch"
+
+	python-distutils-ng_src_prepare
+}
+
 src_install() {
 	python-distutils-ng_src_install
 
diff --git a/dev-python/doit/files/doit-0.16.1-setup.py-encoding.patch b/dev-python/doit/files/doit-0.16.1-setup.py-encoding.patch
new file mode 100644
index 000000000000..4fa9f82e308a
--- /dev/null
+++ b/dev-python/doit/files/doit-0.16.1-setup.py-encoding.patch
@@ -0,0 +1,13 @@
+diff -r c996cf6da98a setup.py
+--- a/setup.py	Thu Jul 05 09:00:09 2012 +0800
++++ b/setup.py	Wed Aug 29 12:10:37 2012 +0200
+@@ -84,7 +84,8 @@
+       scripts = scripts,
+       cmdclass = {'test': PyTest},
+       install_requires = install_requires,
+-      long_description = open('doc/index.rst').read().split('Quick Start')[0],
++      long_description = open('doc/index.rst', 'rb'
++                              ).read().decode('utf-8').split('Quick Start')[0],
+       **extra
+       )
+