diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-03-22 21:26:47 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-03-22 21:26:47 +0000 |
| commit | 521f678d447372b396f592abd3a8b66d7103bc7a (patch) | |
| tree | f6a944e104dc212386ee7523e3d1a21e9c0c3c2e /dev-python | |
| parent | mask dissy for removal (diff) | |
| download | gentoo-2-521f678d447372b396f592abd3a8b66d7103bc7a.tar.gz gentoo-2-521f678d447372b396f592abd3a8b66d7103bc7a.tar.bz2 gentoo-2-521f678d447372b396f592abd3a8b66d7103bc7a.zip | |
Upstream already fixed the encoding issue by removing the non-ASCII character from README.txt. Bug 504778.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pytz/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-python/pytz/files/pytz-2014.1-setup.py.patch | 20 | ||||
| -rw-r--r-- | dev-python/pytz/pytz-2014.1.1.ebuild (renamed from dev-python/pytz/pytz-2014.1.ebuild) | 4 |
3 files changed, 9 insertions, 24 deletions
diff --git a/dev-python/pytz/ChangeLog b/dev-python/pytz/ChangeLog index 1a0a7f1bfc83..2ec3667260ac 100644 --- a/dev-python/pytz/ChangeLog +++ b/dev-python/pytz/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pytz # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.172 2014/03/22 21:16:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.173 2014/03/22 21:26:47 floppym Exp $ + +*pytz-2014.1.1 (22 Mar 2014) + + 22 Mar 2014; Mike Gilbert <floppym@gentoo.org> +pytz-2014.1.1.ebuild, + -files/pytz-2014.1-setup.py.patch, -pytz-2014.1.ebuild: + Upstream already fixed the encoding issue by removing the non-ASCII character + from README.txt. Bug 504778. 22 Mar 2014; Mike Gilbert <floppym@gentoo.org> +files/pytz-2014.1-setup.py.patch, pytz-2014.1.ebuild: diff --git a/dev-python/pytz/files/pytz-2014.1-setup.py.patch b/dev-python/pytz/files/pytz-2014.1-setup.py.patch deleted file mode 100644 index 646260987fb5..000000000000 --- a/dev-python/pytz/files/pytz-2014.1-setup.py.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -2,7 +2,7 @@ - pytz setup script - ''' - --import pytz, sys, os, os.path -+import pytz, sys, os, os.path, io - - try: - from setuptools import setup -@@ -27,7 +27,7 @@ - version=pytz.VERSION, - zip_safe=True, - description='World timezone definitions, modern and historical', -- long_description=open('README.txt','r').read(), -+ long_description=io.open('README.txt','r',encoding='utf8').read(), - author=me, - author_email=memail, - maintainer=me, diff --git a/dev-python/pytz/pytz-2014.1.ebuild b/dev-python/pytz/pytz-2014.1.1.ebuild index 66d758fea8a1..c516c61238b5 100644 --- a/dev-python/pytz/pytz-2014.1.ebuild +++ b/dev-python/pytz/pytz-2014.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2014.1.ebuild,v 1.2 2014/03/22 21:16:03 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2014.1.1.ebuild,v 1.1 2014/03/22 21:26:47 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) @@ -26,8 +26,6 @@ PATCHES=( "${FILESDIR}/${PN}-2009j-zoneinfo.patch" # ...and do not install a copy of it. "${FILESDIR}/${PN}-2009h-zoneinfo-noinstall.patch" - - "${FILESDIR}/${PN}-2014.1-setup.py.patch" ) python_test() { |