From 957662801f165d0007dda1f6e4d654ebf396aee2 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 5 Aug 2012 03:53:12 +0000 Subject: Fix unicode issue in setup.py for bug 429914. (Portage version: 2.2.0_alpha120/cvs/Linux x86_64) --- dev-python/sphinxcontrib-googleanalytics/ChangeLog | 6 +++++- .../files/setup.py.utf-8.patch | 16 ++++++++++++++++ .../sphinxcontrib-googleanalytics-0.1.ebuild | 9 +++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch (limited to 'dev-python/sphinxcontrib-googleanalytics') diff --git a/dev-python/sphinxcontrib-googleanalytics/ChangeLog b/dev-python/sphinxcontrib-googleanalytics/ChangeLog index 87cda6fca25c..78e1002f839f 100644 --- a/dev-python/sphinxcontrib-googleanalytics/ChangeLog +++ b/dev-python/sphinxcontrib-googleanalytics/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/sphinxcontrib-googleanalytics # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-googleanalytics/ChangeLog,v 1.1 2012/06/28 19:36:52 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-googleanalytics/ChangeLog,v 1.2 2012/08/05 03:53:12 floppym Exp $ + + 05 Aug 2012; Mike Gilbert +files/setup.py.utf-8.patch, + sphinxcontrib-googleanalytics-0.1.ebuild: + Fix unicode issue in setup.py for bug 429914. *sphinxcontrib-googleanalytics-0.1 (28 Jun 2012) diff --git a/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch b/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch new file mode 100644 index 000000000000..b3b9f58d1b2d --- /dev/null +++ b/dev-python/sphinxcontrib-googleanalytics/files/setup.py.utf-8.patch @@ -0,0 +1,16 @@ +https://bugs.gentoo.org/show_bug.cgi?id=429914 +--- setup.py ++++ setup.py +@@ -1,10 +1,11 @@ + # -*- coding: utf-8 -*- + ++import codecs + import os + from setuptools import setup, find_packages + + HERE = os.path.dirname(os.path.abspath(__file__)) +-long_desc = open(os.path.join(HERE, 'README')).read() ++long_desc = codecs.open(os.path.join(HERE, 'README'), encoding='utf-8').read() + + requires = ['Sphinx>=0.6'] + diff --git a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1.ebuild b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1.ebuild index 9f9d50882de9..48504cca125d 100644 --- a/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1.ebuild +++ b/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.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/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1.ebuild,v 1.1 2012/06/28 19:36:52 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinxcontrib-googleanalytics/sphinxcontrib-googleanalytics-0.1.ebuild,v 1.2 2012/08/05 03:53:12 floppym Exp $ EAPI="4" SUPPORT_PYTHON_ABIS="1" -inherit distutils +inherit distutils eutils DESCRIPTION="Sphinx extension googleanalytics" HOMEPAGE="http://bitbucket.org/birkenfeld/sphinx-contrib" @@ -20,3 +20,8 @@ DEPEND="dev-python/setuptools" RDEPEND=">=dev-python/sphinx-0.6" PYTHON_MODNAME="sphinxcontrib" + +src_prepare() { + epatch "${FILESDIR}/setup.py.utf-8.patch" + distutils_src_prepare +} -- cgit v1.2.3-65-gdbad