summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarien Zwart <marienz@gentoo.org>2012-08-29 10:22:38 +0000
committerMarien Zwart <marienz@gentoo.org>2012-08-29 10:22:38 +0000
commitc2411ef03984198b955f0528fe093d7c9e74ac0f (patch)
treeb450bfbc5c0e41107188bf89e339bea604eec37c /dev-python/doit
parentAdd missing dependency x11-themes/hicolor-icon-theme #291533; Drop dev-util/i... (diff)
downloadgentoo-2-c2411ef03984198b955f0528fe093d7c9e74ac0f.tar.gz
gentoo-2-c2411ef03984198b955f0528fe093d7c9e74ac0f.tar.bz2
gentoo-2-c2411ef03984198b955f0528fe093d7c9e74ac0f.zip
Make setup.py work in a non-utf8 locale (bug #430034, thanks to Flameeyes for reporting).
(Portage version: 2.2.0_alpha123/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/doit')
-rw-r--r--dev-python/doit/ChangeLog7
-rw-r--r--dev-python/doit/doit-0.16.1.ebuild10
-rw-r--r--dev-python/doit/files/doit-0.16.1-setup.py-encoding.patch13
3 files changed, 27 insertions, 3 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/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
+ )
+