Revert utf8 patch as it breaks python2.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 18 insertions, 33 deletions

diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index fcc1fcf0cb6a..066b5084b2dc 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/logilab-common
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.120 2013/02/09 17:33:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.121 2013/02/09 20:05:07 floppym Exp $
+
+  09 Feb 2013; Mike Gilbert <floppym@gentoo.org>
+  -files/logilab-common-0.59.0-utf8-test.patch, logilab-common-0.59.0.ebuild:
+  Revert utf8 patch as it breaks python2.
 
   09 Feb 2013; Ian Delaney <idella4@gentoo.org>
   +files/logilab-common-0.59.0-utf8-test.patch, logilab-common-0.59.0.ebuild:
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index f85c8409b9d3..117b2f709a28 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -2,7 +2,6 @@
 Hash: SHA256
 
 AUX logilab-common-0.59.0-syntax.patch 520 SHA256 77a17ccefe982a2cc64a39b678b9b75253e19ad4f4e9550d7b360c4b3fc5d41a SHA512 deb6d7e4b44dfa8092bd531362a64dfb51fee841e4b4123fb18a7c4cc4f6ce41d222be508c73a2aa62cc8cffd347febd04a648b939b510740316a3f668e3f435 WHIRLPOOL 1840b91834bda4eee3d96e85a6a85d6486a219a82904b606fa29c2d6b4807ef01826e990f1fac2a00f5a03d02fdac16f80a426b2fcfa2707045ed90119fd649d
-AUX logilab-common-0.59.0-utf8-test.patch 939 SHA256 5a09093f5e88aff8eb81f6a2e9aa08e96876f43450d92c0aff4b571e8d4c1494 SHA512 79d06a300c9e97670eb8f1d5916d39d0fc5d6222cca6e047b76c1a72b06b750c26574a99eabe1f9402b5d5024a481e354c7114b2aa753d98924b3da431bba9d0 WHIRLPOOL 8d96087c857789f229a309486f0de71eaef661f9d069753273ea2c772c5a33367890b762ccc3957d552b2b7a5ab701b5726f563ef091176a338499d6a9d5cea8
 DIST logilab-common-0.55.2.tar.gz 182524 SHA256 3242039f4e0732b510e03ef638f1ea43e65ddb7154164a9bda02514ee514f99a SHA512 bbc5b3ee84e53a20ddd04be9703022ae73b163537c9a9d812ec4c49fdfdfa9758c3a45e065cb8fb693cca2deb1dfbd032493923ab3000f59d88945139f95719a WHIRLPOOL 8d5f6c62ebf5e5ced1902f4dfed457b94aa879b92ceb854ed715b0d2975a82ebefb38f64bf4f1ff6bf7a57ae63ec4a56f867782d1e0739ed1ee35474e3490b92
 DIST logilab-common-0.57.1.tar.gz 181975 SHA256 102c4860cad1ffaee98e6746ad89de4e5c40b63a569d4e131379b84c4907ed0a SHA512 84d4be823fbbff0944a6f9162dc365feea6e6116d43c2c5a65726a4e7347c771fbecaf9a4d8d81c3cdd7f79ab9a6697ab1def0bf1f4219cb947c8b1a7012c023 WHIRLPOOL 95914ed46451447f2b023fc4b86bc8c27bc2d9a99c2b7e73da6ea704877a8ed761c56cf4562afccffb6d6b7da0853cc5575922c790de7f81438a0c6c343286b0
 DIST logilab-common-0.57.2.tar.gz 182851 SHA256 feb56645bf944cbbb4d193e77d5780463084c0d2b50370885054f9144e0da86e SHA512 cbc4f96bced643b8ad0d49d06124bce68bcfbff04195c71b6ab9057dfc836f9b509f31d97c4ff35b2ccaba98a01dc6de095bc125ed37c20cbc378cb5d8d35646 WHIRLPOOL 13d4090e829d575ba438de260f014c5352bc5745f96209d2df54e580c10daf7db9ec5f1afb0d406614844b9fba347792b6fe7e5d66705b53e747336c54d05296
@@ -16,13 +15,13 @@ EBUILD logilab-common-0.58.1-r1.ebuild 2654 SHA256 e7f56d5e5ebdd4a654a11e53a4818
 EBUILD logilab-common-0.58.1.ebuild 2099 SHA256 4a117044779e7de41aa23b420c05f42ae64c8cfd593473897f8ff8f4d2ee1d9b SHA512 ea3b1c25c7dcb62859209f3b93374a58a7f84d502ce72fb22753099ad0295919af4ec45f5f779c7feb152b38669016c67ac11fa6a38c63cf1482b697dc6dbfde WHIRLPOOL 64435bf497d7bd92e0a59c34fb3809f4339e176179a830a044aad007b0e20018d110a4d31a8c2c18185cafea76fbcd77b626274f01c3deffb8a013b3cb744f7a
 EBUILD logilab-common-0.58.3-r1.ebuild 2639 SHA256 2f4a816d5d2842c8a1b58dc899f6a9bcc4bb5f1836dcc7438af0f825cecb8bbd SHA512 1ed2258213a04a216f8c5c2a095e39eeaa5bdd5afd5152a6cdfb42f20c1ceb9d1a4e30d99728fc8391def76021d493950bb80acc5e049ebda37c2e9e9f7b7489 WHIRLPOOL ca936c0cfc1cf633e29e2204a97b98eb8e047f65e11a9819d6e6cbc3f5ed1123116d58c6c86c6d8f02f7bc3d66f3d83d48f7baaec49c7af387d7568c4015eae3
 EBUILD logilab-common-0.58.3.ebuild 2651 SHA256 25b8be1c03f29cff9f2f53dafa38972db5b639e5de0f500593760eb998cf4ea5 SHA512 f1cef916c5e23768e198434c6169912b0870f4291aeb593367ff03e99712a556a0c1bd47738250a9dcf9ec56f2e5568c776361124595e58f8c2dc9d7ec15855f WHIRLPOOL a63d479dd6e9f052a7f9ecd884ba8a3c34610c9f179513b8eb331a972a639543dde5aaec982d4b5053c5c8b9573b9e8466897e063f64a329f721d1c13148eb9a
-EBUILD logilab-common-0.59.0.ebuild 2732 SHA256 d42267d63d9b7de91a5d94ce8793ecdaf6d333be94538ad58f07417f49c2af33 SHA512 f794a62bf2e59c8a562ac71248922af4717cb8b93be1fdcde1d9f362b0ea7926ae573987e3daf34948be01935a01881f392679e7efa5c32fc23441ebfed496d7 WHIRLPOOL 49ef3b65f6bec3ea591e6b663930c78a3507a7c491baf566bd2c1c47cae3ec827a1daef66086ac21f6385d053a433f6f65d21df474437f8a2769da437ff3ae5d
-MISC ChangeLog 19516 SHA256 5c237d218af4053dfee87b5332d0571b40c71e25eb38940499e8ad0fb3ac1fa1 SHA512 9289d36d0f06501f43ca9e7890fc417a2ea9919d2bf00615f3a748a4195603b62667a9d20d174fab8630b0279e52d43896e9ee0afdd1af22500cea1fcb426b47 WHIRLPOOL 78e457dcbae550f514275df575f769694c86ac3b7276dd488b1692e61f18ea3f40ddc84e1b112e443429bb90a430991c0af84d95bd4e20eed7eb5a2e62687f64
+EBUILD logilab-common-0.59.0.ebuild 2737 SHA256 0eda8914a807e74341bf28fe70730aaa1b5eb8deb586d1af782086798be94c7b SHA512 ab2206ff6ec608965e44cd5ebe080b339222e87ebd0821d6b8eb6790b65bc2e8d544c1140b3c4ea18208db36fa573e6343e8eba9a59bfb2f590f0cc6d6ac93e2 WHIRLPOOL adbb7e177fcf302338e14ed13ebc12d1173e68db8a14f3b896eb87c4f01b7272ab68e8e028e9e8a0910c51891f5f4f2154c6833130163ca4926c370b3ce1a284
+MISC ChangeLog 19686 SHA256 a9786b514515d2fda4e3c4ec20c5c92e664250be1d532b870061d3d75fb6cf11 SHA512 0dfd3c377e4c6fc20c09f0b145ff8690bcb6eab4d091267a1efa6a736adfa98d0ec428ad961378b80285b96dc248d01cb9201279d357f3b63df4a91440486e9a WHIRLPOOL a9c6845f17c55ddf55ac43b84d82d5e3f12e77c054edc280b51332cb3d9ad8f7929c9a0abec5e1818ac6d5e54bd9c8c300ca7903826effdbb3c726d1d8236747
 MISC metadata.xml 237 SHA256 523ae42d51ae087b615a63e6b30e3c6c1d3910f2ccc0c03685d6939756660c16 SHA512 74f7a5fc9ffe80a474f05ed5ab7fe94511ea85f65325d3f16c5cb9af5b072b9aaab5ddf99464e34d12a47dd4861a76e16486fc8815a502036530ed74c73047db WHIRLPOOL d95ffbf06f4021d81c7b5f17bc1c240e47db7a3344526c053ae504d8442658d93ffc13d9f89e91991d6327fc92b31bd9499a9ec3f57830dd9834ca3b349b1e1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEWiJIACgkQso7CE7gHKw1zWQCeLb5vjleLGqz3P8RzXfzUl35/
-mIgAnR74bFgYVbrkDXQPcr45zLUFuLCt
-=O3rJ
+iF4EAREIAAYFAlEWq/QACgkQC77qH+pIQ6Q5MwEAwYf793UUWQ+ETd3Ndw+QoOOn
+WAlVNkQf2j0rCMwPjz4BAKmCistbX/pI6tvXirqrQUstZkiZbleDkr7hTWDxmDe/
+=8co5
 -----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch b/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch
deleted file mode 100644
index f0cd39addbc6..000000000000
--- a/dev-python/logilab-common/files/logilab-common-0.59.0-utf8-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur logilab-common-0.59.0.orig/test/unittest_umessage.py logilab-common-0.59.0/test/unittest_umessage.py
---- test/unittest_umessage.py	2013-01-24 01:42:03.000000000 +0800
-+++ test/unittest_umessage.py	2013-02-10 00:53:58.431767641 +0800
-@@ -21,16 +21,17 @@
- 
- from logilab.common.testlib import TestCase, unittest_main
- from logilab.common.umessage import UMessage, decode_QP
-+import io
- 
- DATA = join(dirname(abspath(__file__)), 'data')
- 
- class UMessageTC(TestCase):
- 
-     def setUp(self):
--        msg1 = email.message_from_file(open(join(DATA, 'test1.msg')))
-+        msg1 = email.message_from_file(io.open(join(DATA, 'test1.msg'), encoding='utf8'))
-         self.umessage1 = UMessage(msg1)
--        msg2 = email.message_from_file(open(join(DATA, 'test2.msg')))
-+        msg2 = email.message_from_file(io.open(join(DATA, 'test2.msg'), encoding='utf8'))
-         self.umessage2 = UMessage(msg2)
- 
-     def test_get_subject(self):
diff --git a/dev-python/logilab-common/logilab-common-0.59.0.ebuild b/dev-python/logilab-common/logilab-common-0.59.0.ebuild
index 4be295097bff..8d5f933206a4 100644
--- a/dev-python/logilab-common/logilab-common-0.59.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.59.0.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/logilab-common/logilab-common-0.59.0.ebuild,v 1.4 2013/02/09 17:33:58 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.59.0.ebuild,v 1.5 2013/02/09 20:05:07 floppym Exp $
 
 EAPI=5
 # broken with python3.3, bug #449276
@@ -31,10 +31,12 @@ DEPEND="${RDEPEND}
 	)
 	doc? ( dev-python/epydoc )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-syntax.patch
+)
+
 python_prepare_all() {
 	sed -e 's:(CURDIR):{S}/${P}:' -i doc/makefile || die
-	epatch "${FILESDIR}"/${P}-syntax.patch \
-		"${FILESDIR}"/${P}-utf8-test.patch
 	distutils-r1_python_prepare_all
 }
 
@@ -63,13 +65,15 @@ python_test() {
 	local bindir=${tpath}/bin
 	local libdir=${tpath}/lib
 	local PYTHONPATH=${libdir}:${PYTHONPATH}
-	export TZ=UTC
 
 	mkdir -p "${libdir}" || die
 	esetup.py egg_info --egg-base="${tpath}" \
 		install --install-lib="${libdir}" --install-scripts="${bindir}" \
 		bdist_egg --dist-dir="${tpath}"
 
+	# Prevent timezone related failure.
+	export TZ=UTC
+
 	# Make sure that the tests use correct modules.
 	cd "${libdir}" || die
 	"${bindir}"/pytest || die "Tests fail with ${EPYTHON}"