Add setuptools dependency, bug #467242. Fix compilation in non-unicode locale.

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8DBDADE

4 files changed, 40 insertions, 8 deletions

diff --git a/dev-python/python-mpd/ChangeLog b/dev-python/python-mpd/ChangeLog
index 022601c28ab0..e32e8e76f55f 100644
--- a/dev-python/python-mpd/ChangeLog
+++ b/dev-python/python-mpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-mpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/ChangeLog,v 1.29 2013/03/24 10:37:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/ChangeLog,v 1.30 2013/04/25 18:14:24 maksbotan Exp $
+
+  25 Apr 2013; Maxim Koltsov <maksbotan@gentoo.org>
+  +files/python-mpd-0.5.1-non-unicode-locale.patch, python-mpd-0.5.1.ebuild:
+  Add setuptools dependency, bug #467242. Fix compilation in non-unicode locale.
 
 *python-mpd-0.5.1 (24 Mar 2013)
 
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 01711fb57efe..b22a844860ac 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,18 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX python-mpd-0.5.1-non-unicode-locale.patch 614 SHA256 6c17e151d598b8c63bd521fdeff44e1558a50f3b1dcac5240cdea46fd8ef3281 SHA512 cd7fa2ab99aea39007d1ac76da4433a029ca6fb93c8e15ce83b177cdb690c7e03e242b85436a21fc702033c6c411bdc50b90b4514249c8b5793fcf65f7aba54f WHIRLPOOL dbb8a432ddf6bd47b86dc0595a890c7b2b0af5d2a928fc6a83296aeb8a6ade851af2217b3e3e7abd6d2349c51437d68b0928e268bb7e1546e00137b26442b69d
 DIST python-mpd-0.4.3.tar.gz 25080 SHA256 85d92369b45ea407fa6129b793d5a77f989d85369503380eca7e380d9a33c37b SHA512 f66ab330a574d6a2f2e5d2f3891a4c2b39196bd107cb84a4d2870d0a452bd59ce3b18dde8c8e205d07d0a96d31a34b4dc1bf90d5c28f807b180e193e13e0f945 WHIRLPOOL 4c0cee171da6c6ebf421d7b8f705e745f4f3d458774a567cd6576d12b3071b6571a8f40cf6788d708e1b54f9a369c943a269fa219bba5b9e1c6f808b03a09724
 DIST python-mpd-0.4.6.tar.gz 27340 SHA256 4e0f18a467ebbb2b08e07579c4744f0a7640d15107eb9813fcea2bf12cdadbf0 SHA512 33adb7b68753e64f3c284885ce374f84e7f54677f695730203932ed1c6142187c272d461b72cea364038372575b2f09fa41fb8bcbfe1e08d012b6b655abd73ee WHIRLPOOL 3d94c1280d3031a8c8705288a9d48b4dcea7d7a1c8a2b4a86e5620742652c89d1fe32b57139a3332fec87460c0b39cd11d27a09ef1afcf5703376eba7d5ceec9
 DIST python-mpd-0.5.1.tar.gz 29573 SHA256 6e7bb1c265c8b0be0b8cc366d1e68fdc5328546b25ffc5be0e8b085eb75f7ddb SHA512 ea94b35fa6240bb978bb0bc954e72e76c40c69e78c87262400a78f0ee464d6938c19ae255c79fb2ad445fc832ad9a3b38ab29688546a11f93a8f8bab1285bcca WHIRLPOOL 840684e9a0f733986e730dc9b6ef128e9cd0bcfc4472f80c75a3ccf11083b2c01510dc3abeef5322f834e125b0f1ff4abc8aee9c74abe5d208137a35e5a6bf5d
 EBUILD python-mpd-0.4.3.ebuild 629 SHA256 8eb200b4dfbc7fecb785d4aa895c7668f3095f1b9966ee0c427ad46fdd54a32b SHA512 64ffcf78e84b4f943974c362681b3d1b36404d2b92f91a4faa7ad1d6c4087848b3ed4a2dc6af5c893d46b71453aad274b548e6d962b71ab27bfe7504c3aef8e5 WHIRLPOOL 9af1d4b3be7bf4b73c15e46436f2a65ac7663b87f9b53d889c7be3d007451199da7f837e34abf8187124d5914540c90bcf339b5527c47052146a8e4e14872494
 EBUILD python-mpd-0.4.6.ebuild 788 SHA256 cd4e35c1eb62f66b282c5002fc0b1bf6e26660f3b7ecc5106afe262f5422734b SHA512 86dad5732aeddd786aca17c3156b2f2677bd15a8a58a589183d8d531d4cbece5dddc213a18ea3c4a11f682897b8c2838fe1fb200633611b63079dbf0dc1d64d9 WHIRLPOOL 1faec6306f9be194f5f90d852d0a971363489834587bb5fb92aecdb441dbacda2b5c38a5a8837d9f662fcf5a6c0fe8ba3dfe03f1150e7f33f2d3f95e4753407a
-EBUILD python-mpd-0.5.1.ebuild 809 SHA256 881a2c9a0179c32965c6c06a21ef4207a09ced5ab4905dd5d47797d369d18169 SHA512 74641310fdc782bebe827bd5fe03aabe41758961559263ae94fb39dcd9520670dc6efae29c8a5e8ab0d98ecacd1b40036dfc6dc3a57c1d06f0e0d53fa0eb81fd WHIRLPOOL 11b63f9d821af3bba6b50ebb5de8a3a9a8aa785930bcb0250e340d29a05775a49ddc865666f7a46cdf050f68bced6ce6fa36bbd7aace3c6ad19d74df8af20fc0
-MISC ChangeLog 3861 SHA256 edf1e342c0400757ff8a8ca58625fcff02190e399ad16fd3537b548962ac44b8 SHA512 dedd9b17119448c1ccce809b0244bfd2ab6c35db9c6fd6484a4490de467bc5d6ff6e7bc94ec8e7943fcb8f9b400950744fe950369335f442403b94f1dc68ae07 WHIRLPOOL de9752f13ca5928aaf91d7a2875a02818d74baf21e92e132dd959180c529291ce916259478c2208f31c6ef60128c8cbcee0b44e9e204878e1837fb8aacb6e391
+EBUILD python-mpd-0.5.1.ebuild 908 SHA256 54b9b68348ca03c79d62e1847f640d58cababf86cbf668de96fd7c10c951aec0 SHA512 bc95ed9d4ef236f6aa313157c479c105dfa7cfd46eaea1c1477a8eb0cfd1acd4e4378b76292316e2e6d74b00f53b0aad65fd7087d77f4461f8a4b39f392442fc WHIRLPOOL bbf391bdee3afa8d3a29ae3960de83e29471140c8cb017db31af9eee07336f29695a96b72ed72784bae5d5e877407ce0490f1af50ca6a63f2a27a4f4beceef3a
+MISC ChangeLog 4074 SHA256 c62efb3f8e276d8c8d6b918a64854825349bbf01763b2a650f30b84cd7cfe25e SHA512 5e1aa3f53875f754c26cf99b3ff826bdfcf0f0c5a751db8977b188266ee80c709b9ab8ea40e702475caf385021567c6b9704d58aa95ffc55d736fc127f3ccc30 WHIRLPOOL 43b9bde6fd41405495a4f84387de0045864152cb373e3ec2e62a91a1ffc36818e4e183d05b6285369e180b601993006bbc771c9cf67cf5ec5f38905d63517403
 MISC metadata.xml 329 SHA256 4481bc4e2205d56c6e01f3306408e85173b3067964900362b0e7c469aa91eb3f SHA512 c38712ed6bc57e1e70a295a0623fc0e8be949354f86d1713af432bfdd6db73e46d5375116e1e1a95d09082ec2c4166a0bdab478202b9b6118188a43d5f8ac528 WHIRLPOOL c130e04aa3367116c23671693e4213ccb8775750f90142e78c157510f8f767cab8fd6de7082d3347f26a4ee2ffa24c722330683a6e4bcf21151d3c752efa0442
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFO13wACgkQmWq1bYTyC0PqSwD+Mc6ELIfP9j0jp4hPEGslgkDx
-0FXM8HvTigew4CJq7UMA/j+AQKS/vrpFXLdNPUYmb3kl8S5Jn6JSSw8WdfNw7Uxq
-=I2Ul
+iQEcBAEBCAAGBQJReXLGAAoJEAmJmMX429re/tEIAIEEKZo5C3XLqd3nvLDhDl1K
+DBYWzEoDK0piLBgEaaNBTK3QUQ2q0p9cr+HPKrxj0cDRESLSsS3QgSCXW0fi31aJ
+iuz84Swcv83A/t1ooQ7FaVxW/j4xdLYdN/zNhIIyb7eGCmdgqTV2K1JLWBSoKFU4
+iu5zqFVRWPHR3xUGYQ8IZWzXCyvpMjCQK4YPVHnfnk9GnKUJIxpOfYRnzrOHMsCx
+C6tjmghH50wjVNEYVH8t9WOO8y4O4jlNUTSJjz7hgKEuUqVeFJmR2vagVelmNzuk
+Tuy1jMKsMioZ+V3Rne0HW72YzU2hJTJFwpvQMt6tf4K8X4yjdkvVXvJsl8+k9RM=
+=zlwe
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-mpd/files/python-mpd-0.5.1-non-unicode-locale.patch b/dev-python/python-mpd/files/python-mpd-0.5.1-non-unicode-locale.patch
new file mode 100644
index 000000000000..33f59427ed42
--- /dev/null
+++ b/dev-python/python-mpd/files/python-mpd-0.5.1-non-unicode-locale.patch
@@ -0,0 +1,21 @@
+--- python-mpd-0.5.1/setup.py	2013-03-21 23:45:53.000000000 +0400
++++ python-mpd-0.5.1/setup.py	2013-04-25 22:01:52.000000000 +0400
+@@ -6,6 +6,9 @@
+ import sys,os
+ import mpd
+ 
++if sys.version_info[0] == 2:
++    from io import open
++
+ CLASSIFIERS = [
+     "Development Status :: 5 - Production/Stable",
+     "Intended Audience :: Developers",
+@@ -45,7 +48,7 @@
+         sys.exit(errno)
+ 
+ def read(fname):
+-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
++    return open(os.path.join(os.path.dirname(__file__), fname), encoding="utf8").read()
+ 
+ VERSION = ".".join(map(str, mpd.VERSION))
+ 
diff --git a/dev-python/python-mpd/python-mpd-0.5.1.ebuild b/dev-python/python-mpd/python-mpd-0.5.1.ebuild
index ed801da7775b..009688b4e988 100644
--- a/dev-python/python-mpd/python-mpd-0.5.1.ebuild
+++ b/dev-python/python-mpd/python-mpd-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.5.1.ebuild,v 1.1 2013/03/24 10:37:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mpd/python-mpd-0.5.1.ebuild,v 1.2 2013/04/25 18:14:24 maksbotan Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
@@ -17,9 +17,11 @@ SLOT="0"
 IUSE="test"
 
 DEPEND="test? ( virtual/python-unittest2[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}] )"
+	dev-python/mock[${PYTHON_USEDEP}] )
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DOCS=( CHANGES.rst PORTING.rst README.rst doc/commands.rst )
+PATCHES=( "${FILESDIR}"/${P}-non-unicode-locale.patch )
 
 python_test() {
 	"${PYTHON}" test.py || die "Tests fail with ${EPYTHON}"