Fixed 513950

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x55265D89

4 files changed, 45 insertions, 13 deletions

diff --git a/sci-libs/Shapely/ChangeLog b/sci-libs/Shapely/ChangeLog
index 78fc544faa8c..7a93ec212f5e 100644
--- a/sci-libs/Shapely/ChangeLog
+++ b/sci-libs/Shapely/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/Shapely
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/ChangeLog,v 1.1 2014/02/28 14:04:31 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/ChangeLog,v 1.2 2014/06/20 09:29:34 slis Exp $
+
+  20 Jun 2014; Sławek Lis <slis@gentoo.org> +files/setup_unicode.patch,
+  Shapely-1.3.0.ebuild:
+  Fixed 513950
 
 *Shapely-1.3.0 (28 Feb 2014)
 *Shapely-9999 (28 Feb 2014)
diff --git a/sci-libs/Shapely/Manifest b/sci-libs/Shapely/Manifest
index 0da443abcab8..02589e8da32d 100644
--- a/sci-libs/Shapely/Manifest
+++ b/sci-libs/Shapely/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX setup_unicode.patch 698 SHA256 507d6fb5a65ceeceb788c1a17efc96cd34fbd5912c2ddb37f606ffab2dc3d927 SHA512 f3e2766a1da5586a5c534d4e2eae1a00545d5af90e0f7ce92d2a1e38644f07b6db90c7ab20742d390e79198b6d5957900a7cd6777515a773fab2f1f98e09c8dd WHIRLPOOL fdf1f6badda690465169a9f7a660f78fec54b94ea60f36ab33bc7d529223df9f3d894607754c6659fefb1702c1bc73412c33961ccb7367782c3bd0105f4e2924
 DIST Shapely-1.3.0.tar.gz 118863 SHA256 297df004aec27e38ed93987e93ff5f8187cd0299394fe8b0b9028566015a9bb5 SHA512 106f9773a5b00e7269a84c760f3a2b867c48139c48eebeecd524c8216d75c28daaf46eff45c118c1809999e33a317e9aca278a8d83605dc7273877a7ed3edd82 WHIRLPOOL ddf42cab233b0950a4a955070c5a2a7791a7f259ba857778689944c7799484f7c1aa710926c37c8c66deaae5ab4f03d79fa2f407e8e6d05238217b529e7b1b15
-EBUILD Shapely-1.3.0.ebuild 815 SHA256 d10d5ef3e449761fcdc2d80fa5a8169e8db3db56df33b010108e6815fce42844 SHA512 493accbfca2ef55f25aaa89117dba1d7a190498bed497ef2df8bdb9a86a1bdbb1adf7df9f80cb390294b09210becf03de5939335593d4d74cf75573f8184bbb2 WHIRLPOOL 783e1135e7f7e8a2977272cff0ca18e38be3066f251569fbc88f62ea7b997dfa54901394f1c4132631b86995de7100ad0676adaf45c711852d1f44f3994a1f73
+EBUILD Shapely-1.3.0.ebuild 877 SHA256 e884d1e084ecca3c8f536045f52099ae5e8dba12874b3055ffd56cd570132094 SHA512 28c538d4a2696f2dda6c3264f455345d1ee9238d8137fba0e05f458fd7f19cb56a515369acb5b6e32463531a1256bda5545ea4e845578bbac98ad4766ee6125e WHIRLPOOL f7c612baf7e88482dce9caf00c73dbe1d472d0a864c744cdb9308a21f142ed04fb96d36398bbd8ab73cf8c78001f8e6a0408e9bb1dc501011953cc6b76ba4f33
 EBUILD Shapely-9999.ebuild 814 SHA256 d23203d96ccd52596f35cf15299d819ef9a998242d9cac9877a807501074ee40 SHA512 ca6b84ddaa0147cf77e8653858919f930282e5384fc9ceb0930f0381b240011428689cadade414c838be21a80cb5d3aac01cafdd72a6824e1acd349d06bb49b4 WHIRLPOOL b02d7e2741c44a3627186fae1d113abfdfb25c678ab4141b692f0fa3387064c252b1d1a7aacd4b8bb36d70e81f9cde185b0f6252e27ad063221059a537f787ff
-MISC ChangeLog 392 SHA256 499a8ff93e5560d54a8bf75f8a8db4c9346c025b40dc9eec2104d4eafe5d784e SHA512 dfe9e769e63692c83a54541e38ede13c40facd78ecc32c0359cbffd21736cd95268cefc26890ee629c6f3a166fbed4ac4bf221494408af709e89f452a9cd6539 WHIRLPOOL f1739a66ca7248eecd547220332f6abef6be8f4bc25447a61bee22bdd0e446530d4a9e1ec5619132d60d5a691f6485103e0a5b069553728ab190903388c0997d
+MISC ChangeLog 505 SHA256 a90f86251961b7edbf6e18d167cbfe944ee1d3c1cd225706a245b628f6b671b5 SHA512 4f74d0c1d90047f483d0ddeacf83feabdcde8fa724ab39db1cc94bc58998ac094181490c881fe12c80a375af77e07bb15f826ede7ce5503537c89f1540230857 WHIRLPOOL 89c8d3a1f5fe854dd9179002c95ad4bbc84e5ef75780e1db023a0ecc0dde554b2caeebe0bb2a281b330923edec32a47766cf5f4fa63f527856b0cd36d13eb25d
 MISC metadata.xml 205 SHA256 132e3db1188fcdf8aa6467bde8677e24fc63015666de6104a656a5b074932454 SHA512 e53c51c47b6f2ba5302d5fe6ee9524fe49c69d2b03d66aa0a3054185c7c0a83dedeec75ea15424afe22f1423d72c5bbc1c1e07c6bdbdd1912d8eb8e046a4ef58 WHIRLPOOL 5f4c6dfd2f9dae15971877f2eb53c1d9f6196a42dc62b2d95ffd2060f119d7e0794541b3d8ca565f9ca48479325d19864f74a85289c83d5a5e2396f9144d161c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJTEJcEAAoJEO1RxJ84ipLkZ7AH/1BiYap/fa0JDqUmd0ddtSwJ
-me0TzI179dsEGZVwD3GmZExUY4tTwVHa4aVVuodFBLEEGS0QMPF3sHX6nPD3jMMC
-tpxnEKmed4eZQlN5yq9m02o5uQKdiU7aI/mrBUTRnkrSOxS6pVJkO+2Eb9L3lWc3
-QAH87zbDan69VM1pCKd12juxMgptbSfi3vVlZ/U1OHUm7A0tO+jSY4YUSE3q+9QY
-g3ZpzqDZmtORtVYppWXCUUu43c32tmBhdxl3f5cuD/NAAw4vQc7/lMRzJ7rtX9ep
-aEzZlLKz2xtvcye1m5Uj+XIxjSMfAJ7ISOxTmU1OJ0CXValairTaTMm3QT+i/4E=
-=dLxe
+iQEcBAEBCAAGBQJTo/4AAAoJEO1RxJ84ipLk8q4IAIC2wjUXTeDHgfS70Tr27Oc0
+DZWDPlAOsiTtX94Xv8+uiBoTCGQZD6E1VHW3u6+vdUr9lQ50n8GCPHbctSUs+ya/
+/SmYqGquFbQLYK8OFKF8mLx0RO4Bdm5aWfTebQ2u5ii2AfuFfvxBgdoBx5KcArUv
+7E+uFdZu7O9CN4sQDzQ3/OtEjq/qBnS+KXbd+qIwcgn+hhWcLMq1HGyGWVVsnVeM
+gae3ej8VAJlrytdAKxMh7VrgVHHu0risfKdofk9hcqkJPEZn79LXr0BScmoPJj61
+Ifx9giRjTWV1+2oO3j4ba6IFsC1WZa6iFwMMn34k1EyyrVZCD92Xt9PMsJJWTuA=
+=O+YQ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/Shapely/Shapely-1.3.0.ebuild b/sci-libs/Shapely/Shapely-1.3.0.ebuild
index 814952569578..6f3eb5bd6350 100644
--- a/sci-libs/Shapely/Shapely-1.3.0.ebuild
+++ b/sci-libs/Shapely/Shapely-1.3.0.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/sci-libs/Shapely/Shapely-1.3.0.ebuild,v 1.1 2014/02/28 14:04:31 slis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/Shapely/Shapely-1.3.0.ebuild,v 1.2 2014/06/20 09:29:34 slis Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
+src_prepare() {
+	epatch "${FILESDIR}/setup_unicode.patch"
+}
+
 python_test() {
 	esetup.py test
-}
\ No newline at end of file
+}
diff --git a/sci-libs/Shapely/files/setup_unicode.patch b/sci-libs/Shapely/files/setup_unicode.patch
new file mode 100644
index 000000000000..89e1b058f0f8
--- /dev/null
+++ b/sci-libs/Shapely/files/setup_unicode.patch
@@ -0,0 +1,23 @@
+--- setup.py.orig	2014-06-20 10:27:26.638779565 +0200
++++ setup.py	2014-06-20 10:27:29.885446151 +0200
+@@ -1,4 +1,5 @@
+ #!/usr/bin/env python
++# -*- coding: utf-8 -*-
+ 
+ from __future__ import print_function
+ 
+@@ -74,8 +75,12 @@
+     readme_text = fp.read()
+ readme_text = readme_text.replace(".. include:: CREDITS.txt", "")
+ 
+-with open('CREDITS.txt', 'r') as fp:
+-    credits = fp.read()
++if sys.version_info[0] == 3:
++    with open('CREDITS.txt', 'r', encoding='utf-8') as fp:
++        credits = fp.read()
++elif sys.version_info[0] == 2:
++    with open('CREDITS.txt', 'r') as fp:
++        credits = fp.read().decode('utf-8')
+ 
+ with open('CHANGES.txt', 'r') as fp:
+     changes_text = fp.read()