Specify the correct encoding when opening README.txt in setup.py, bug 504778 by Alex Turbov.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 35 insertions, 17 deletions

diff --git a/dev-python/pytz/ChangeLog b/dev-python/pytz/ChangeLog
index a7269ca25168..1a0a7f1bfc83 100644
--- a/dev-python/pytz/ChangeLog
+++ b/dev-python/pytz/ChangeLog
@@ -1,6 +1,11 @@
 # 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.171 2014/03/19 15:23:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.172 2014/03/22 21:16:03 floppym Exp $
+
+  22 Mar 2014; Mike Gilbert <floppym@gentoo.org>
+  +files/pytz-2014.1-setup.py.patch, pytz-2014.1.ebuild:
+  Specify the correct encoding when opening README.txt in setup.py, bug 504778
+  by Alex Turbov.
 
   19 Mar 2014; Agostino Sarubbo <ago@gentoo.org> pytz-2013d.ebuild:
   Stable for alpha, wrt bug #495636
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 926f4ee1ce13..35ac38d380ef 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -3,6 +3,7 @@ Hash: SHA256
 
 AUX pytz-2009h-zoneinfo-noinstall.patch 957 SHA256 4f25eeb077fa14f8423b6742de8276b5153f75d97b0f979556cf634a56e4946a SHA512 142d3ac58be3fffc35e2dc1f70ee988a7c9ebec51518d15bee9d36f4d4a08178840fa4d73f9734e92192c3633e517f525a9d583f7b5dc754af83f7c9536bd446 WHIRLPOOL c1a1861f88ee5be2851e4e8a12f1df0c6beac05af1888527d1120ee9a67c3155b4ad5e0d9d3436e46cc6f027f079cf66135422f9576a333801e7597983cfc575
 AUX pytz-2009j-zoneinfo.patch 651 SHA256 5d015c0857cfab9916bb2d3e7de00d12fee5721d5d3556eb5ad049cc350cfd60 SHA512 228d3c59e3e0b5b0b3b80f5b0b6e947815d11191fd5523d17420dde6cea488bc544c05b552619934c4ca72c30ebefd042114abfea6c72f03710e96a776f39038 WHIRLPOOL c5a4565934dae7fd7b9501ff84c72e0707a52bb73c45f8d525da5477995ed226c693c1962b8219aaf964bd69c84df573d520049d8049013b17c694e1a2cece1c
+AUX pytz-2014.1-setup.py.patch 502 SHA256 8bd2b95fd5dbfd112849723a9ef713e065abb49b75cb6cef9dcb996ed339b3ef SHA512 1271cf6971e922ba75828b715925de245979328c09afe527c3ac6ab3db6cee076a80cd061f6171460540d5617ed018828b1ea7d3e8ae085b87cc3eea467375fe WHIRLPOOL af0a2bf118379208050346da1c2ae6c4f28fec650c0b712160c57146928f6eae75dec8b8d70967115860824cef56c736773828312a9a95f60e5289181cfda62a
 DIST pytz-2012c.tar.bz2 166864 SHA256 16060ed95f992e3629ce98a5dca5c32c732377ce792f9764f407be7100a9deb1 SHA512 8d142b811c5781e48a66efecb400b9b89fa6e321bc8f4303a29f5b8b3e53b0b5ea54ceb4d639ca612ff0ecd0d44f83010d9988f88aceea8c5805b72252861554 WHIRLPOOL bf1156576e19cd37c7e0336875e5f4003fe1e0e41b0d8f4a6dbd03bb678a34e2ce6260177c4300d6b4ce9bdb186d99dbcc546d90b61117ce91e2e71ae1c0ad0b
 DIST pytz-2012j.tar.bz2 214712 SHA256 1fe28ec30c371e3864f4f9b7c9df9bb8351be707b7a128ae4443b0d559d6cbf1 SHA512 52dec29039f415d8b4c6c44994b3d147edcf21fd03a9c065f392417da22bd5b9f966546e13be0014223170a21873f4cdc79a459d298b5546b34a5d66e1ab59c4 WHIRLPOOL cccca26fbcb78379df47d53a9940c8dd79abc402f7f2df1e1688fa670d087868c3aa2cb1ba09873e5d5f97786e08bbf7f4a61e3da64131d93b9e63ad7c3fc256
 DIST pytz-2013.9.tar.bz2 159658 SHA256 4252226fa20e0715d4dcd05f9233f0076c44bca30e4f1793b2fe03cdfb422ed4 SHA512 356daf8b3433ab94e16a20188286608c7644ebbd07de09c1602e262133099fd1b7b801f7ea66c8002a822e1da51caebafc7bebd590676c34d169b3bfa7d9635e WHIRLPOOL 00cdb8f1582f2d0410e70f113a33b0879c975d0314cdd75121f78004bb102eaa326c78232950500d8192c4c5a57e3dd4ce660368417b9c112992d01ce96b4848
@@ -14,23 +15,13 @@ EBUILD pytz-2012j.ebuild 1079 SHA256 2af5c93b2911ccfd95ea82e660dd05cd80ea6c7c2e4
 EBUILD pytz-2013.9.ebuild 1008 SHA256 92d432e16d8d21a7f4b1c99e14b12635c42aa503590b53bb21e5049c0d21d9ca SHA512 0e2cf3b804713c3da880272135e99968456c66ea05426a7ceab58567ba8916005a360308f2dcb0272cc7ebc06ac917329b75f7fc5c732328f06a9633aa0cb14e WHIRLPOOL e039400d20db20bf305dcdc22477e8788fb70e6ef4f666e87ea5289d4f62a41327452ecea592f092fff030d47f8e55d34d63f2f3656e7174a79dbe9a53d8b12b
 EBUILD pytz-2013b.ebuild 1079 SHA256 69dd1e73eee518a2df4694bfd493ff66b3f7062313b917b5ddc2496ff469c801 SHA512 7a86bfd23e012932683d2d29774151a2a24c994f4a270ea9bd59480127c82e88029641c0478833be1f3172978e6437510cdb934e5d7d92d399eddc03a6e5f9ee WHIRLPOOL 50cf142db8755ae2c0d7c4f1bf66fadc3e42b8ef9df213711f5654edfcaa4c2283ce00010fbe4b36ae22eb80212a5635f22fd992dccc8083c7f1fba6fe13abae
 EBUILD pytz-2013d.ebuild 1026 SHA256 74ebc93b09af8d96d1a35efab3be70bd72d1357778985bc73422e18c45ffaf1b SHA512 c44af5998dab8eaf0f66c90467f0de7e5858021cae9638018f54077dfecfbc9821429a3cf9457f09376319a35ba76b729dc87ca7a268ed7bca4c1d0525589e1d WHIRLPOOL 1f2c16091348cb0e7f3ab7cea4ba8ac242ffe83a8ae672b288ac71c25344d76ffbad2dcd06cf104f1856eec504d9c31a7811cd68a148474a6bf77a91bb4cdd45
-EBUILD pytz-2014.1.ebuild 1009 SHA256 6fbebb8e5c422f806586ece555c9344a98f3365d49077c4ff24b5e777580bddd SHA512 c18396f252090944ed688a6dff496460bab4badc04aa31c69fe97b8a84818572c210175403e0d40c355e109e245ce67865244ea525236e142932cdf967d83665 WHIRLPOOL 31753cff07ea818bb3f9bc8994a9757d35d0b01664494f397f7e57bb50d4b6f609b9ae87447695c96c5e3bbc6b6995155d8a0b2338e9b2d31f37e75a0fcae1c5
-MISC ChangeLog 19559 SHA256 b159f645d361af0c329dc0f9b4ea9378d9b902fcb075157735dfd500b096a92c SHA512 e9c931e6545ef8796d54cddd04fabdfc1de15ba0fdff150bf44a37b52f2a81c00d858a9e0db14b74f3b5de2f462200e22f8b2862b212df4a40c628099ca8710f WHIRLPOOL 1c1afe90e210f583343901258bcf617cee560c6aaf4ae274a4813ddde3755c179363091ff3e57d6862329d73b767fb0c2a99d938b71f9b645aa43b2c3946ccf7
+EBUILD pytz-2014.1.ebuild 1051 SHA256 f054bbf373f2e43b0307b8f06fc74c64182ee368ddd97181f9c73e0440bb0c43 SHA512 fd6aea215a9b27d97040a1e739741deb35ff93f593966cb2e9aab9061c30ba4452e3e054685c780accd1705cd5abf9a3d7a7e983a350cade8fb4c5b2a93b84e2 WHIRLPOOL 999dcd7e02136a0be3c4d8cb13c40a9d5199023a39ad40ed75a192fc75697668875e020adedb752ed425666e12da69b7ff5e80632d6de173ee62c042b4722377
+MISC ChangeLog 19767 SHA256 8bcce14589488a0075eeb153cac55433d9679e85db7ea7d54d84b4c04f667f9e SHA512 8b489860916ea61f7465cd248811cddb37f3552dc3518a5426759a2beb586447c3c898e96a762f5eb4d5a33927c338f295a19af0047db07adaddda0501629b8e WHIRLPOOL 2c9ac19c73c997f9e38fcdce88ecbac54b405df655864d105b5baef82b874a2301d7b56470aa2a8f15e04686616598625b09cbe7d67559196d2ab06aa6231578
 MISC metadata.xml 644 SHA256 687282851fbd9238423ebee193076e3a1fe69917a01f50bfe2600d476fd65bc5 SHA512 1cb7d20e287afc3e116777bbcac5dc2c4b1a5a5866d886a0ec3a11076c08cc6b14075ecb47dce2254a104aeebd27d9f8affb161ddabd0954dd7a7570583c2e9e WHIRLPOOL 8b58249ea19fca0353624f944da9cb094fdc8f818288183c036ce32a093984df6b6466b5d7aff9eefa1111249c0744b0d033a132e5731904b83ef26f7551fa15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTKbaOAAoJELp701BxlEWfydcP/09DDJKuVqbLEw3ExBy5I+qz
-WgBe70KOnhoPhXE+Nlg4Nr3Pyz0nxCCyQiOGhxcZMtH0vgp1rapNOSxNz6yPvSwm
-8CtDWzUSV9JuG24LcPRDOLVhfPeDHQGrAz5WtMsuLTLmVIdax4V2QoNU88LsCXv0
-/urGMD4RJRL2OtzE6/7/DzE9If4rvsngfz0NAriUjM5CoCrQhjYrdXqGtpNBds3U
-TRySlMCia5DXDDEZLYwOKoEHBfgoso1f8cmFj4vwoa3EkEEuz9LvPhZiQ0yaywX9
-5+rxAzouph/mJO6+v19oRZOQ88tNi4KB1+/02of607Q/rcKsK08I7IGV6bqyEQvS
-Bsy10lvDII91pH2x+78eirNqEDRG2yILNTVc/wKeohPq1X05jDYbRs+cLSSXfdmG
-HXX7cZfRjU84t1TXcn9+yk5hv6To9FCM6KGjBedUVl+EqEDeFhs6Qgur7r9LJzA4
-5i3loTQPaYiifiKtxIVIHZ/gUtU+L+dmdVXDAquDTFTljhAe/pr6mTcfIRSYB4S2
-G70Q9UNGKRKj04UYGw3pWL7gKEIwxMhqbOZ3zIjIDC9pkxVKMT5vqc4YbvE4ibaf
-5gML6VOIQLxmft5m3ULGJLZK5bxFuUa7/YGImq9i89zoPSUh49Zm9214Y0NJNUDr
-hFzboV4vDLwUpETHD92H
-=B5EZ
+iF4EAREIAAYFAlMt/ZQACgkQC77qH+pIQ6QVIgEAroM4sYE5rB2Iw/+b53dkUSSo
+Hu2e8bpGbl1IWEWPNVQBAMebpVmtj+uTB5W9WwkP7eKa5Zs4ZaR7uAs/Uy1SPoyO
+=LPLR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pytz/files/pytz-2014.1-setup.py.patch b/dev-python/pytz/files/pytz-2014.1-setup.py.patch
new file mode 100644
index 000000000000..646260987fb5
--- /dev/null
+++ b/dev-python/pytz/files/pytz-2014.1-setup.py.patch
@@ -0,0 +1,20 @@
+--- 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.ebuild
index fca364a6d1d3..66d758fea8a1 100644
--- a/dev-python/pytz/pytz-2014.1.ebuild
+++ b/dev-python/pytz/pytz-2014.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.1 2014/03/15 10:50:05 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2014.1.ebuild,v 1.2 2014/03/22 21:16:03 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -26,6 +26,8 @@ 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() {