dev-python/feedparser: Backport fix for py3.3 support

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

5 files changed, 110 insertions, 26 deletions

diff --git a/dev-python/feedparser/ChangeLog b/dev-python/feedparser/ChangeLog
index 3ff8504b551c..b50eac29c458 100644
--- a/dev-python/feedparser/ChangeLog
+++ b/dev-python/feedparser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/feedparser
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/ChangeLog,v 1.49 2013/09/05 18:46:17 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/ChangeLog,v 1.50 2014/02/24 09:05:50 jlec Exp $
+
+*feedparser-5.1.3-r2 (24 Feb 2014)
+
+  24 Feb 2014; Justin Lecher <jlec@gentoo.org> +feedparser-5.1.3-r2.ebuild,
+  +files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch, metadata.xml:
+  Backport fix for py3.3 support
 
   05 Sep 2013; Michał Górny <mgorny@gentoo.org> feedparser-5.1.3-r1.ebuild:
   Clean up PYTHON_COMPAT from old implementations.
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 2dc28c40ad9b..61bc0942d37e 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX feedparser-5.0.1-sgmllib.patch 932 SHA256 5ebe73ace12773111ce625c3becee8835219156d732237f678fe9457c33b88db SHA512 5b10148cadddfea227f17f49d5266be48b2a8c2e6fa97214e24c17a5439cf3edeb8eb6ff5c38b2a46d194809dd8f93fb337b9144157cf30e2f3d577a6843061a WHIRLPOOL 7f0070eb2447afaaf278b5d3a00fafb002704a03f13faeb42823e11e771bc03b08b46f98cda722e66e1e14ea2d794251314ea63b129bda1c340d14a96baaaa89
 AUX feedparser-5.1-sgmllib.patch 2745 SHA256 1eddd093e40096c9f7592d264c458a2d0c42311fb9f204ec4622e9bf8f494256 SHA512 76898f4ff56bbf3ff7ca22132cecfad25356f3b7c19498e793444415874676106d4e7d24c4681b8764ab58a9642e92f1d2af8810e7fe33dcd6e64083c0310f74 WHIRLPOOL 191348a7aa844d2c8065e24be112c61759a1cdd08a35a5f79594dc6f1e5dd6abb5326e69a502a2a15ca2d56031c9a84dd8e86dcae6eb61d40ce6a82b25e49531
+AUX feedparser-5.1.3-backport_fix_for_chardet-py3.patch 1305 SHA256 f20e9daa6019e7dbb9e5b83c472f749675754cb8dbb03c7d5144750b89d85465 SHA512 963ed233160bd5416aec348edea936d78df3303a410124d70661db002a2804db544648318ef4a4816ff82d3ad26553963fdae16810e2db00ce1b96331db9148b WHIRLPOOL 810cf5b80593623d7abc424419da46fcd86cb5c002701e7b9c4b9e1acae98b44cd20dbc65f52d0fbf8b5e69d64a0aea03bd748f454b70a606121b200e68fdc69
 DIST feedparser-5.0.1.tar.bz2 204146 SHA256 57fe918773969eb20fb7b94ab1ae5d3b7eb4a8ce29f49ebc3766fa7f6a4974cb SHA512 d913d09c10850b96a21ae300b613ff8a040fc535804fca59130298808802b30d1e940a35567b5ea78fb17ec4c63328d4f658d380a29c22df42339e96164fef57 WHIRLPOOL c2821b76ecbb8880fc1fcb357376024d4eaec4c30447d6501f2b61fac6abadc603eef5cf7ea161f4b1d4bf9fc92ada5328f8d7d3720001554d41e056c3a36e2a
 DIST feedparser-5.1.1.tar.bz2 198754 SHA256 ae099763f4538aa08c5021d42ba6ce5b9b6218e71423c96031153f379955481a SHA512 5374066a352c8227d7d924d88f65839c746fabcd974e4a3b48f989c54750c242f6639d50f092d198793826dfd4ccba08e49dd2dd25b673ec40a4a92bba9bd7a6 WHIRLPOOL 054db561379162589ef9bcd870c9ae0e0379ba1f2f0c31aa50bb5a9b0bf5407af7f61483b4395ad95c03bec511493cc2e8e0076c516bb3215508db99cc1f8026
 DIST feedparser-5.1.2.tar.bz2 199404 SHA256 b7773afb41481add990539baeb0e441811ec48cb8c1b6c2911cabbe9c5d9d1d0 SHA512 433a0ebb39af1edc67d52e6ef515e1fa9e5499eaebc847312cd796b90e84a16668706981624db78ddcfa32369c0b0492af4461af7499f1df7655938b1d509621 WHIRLPOOL 8aebf0f2046b3c33d173beee5eecd4288e61d0be6ae013ea0b6ffe54864ad164e60ff03eff4ed80e945c4173685f03500298e12df5aaa04503efc90ee5a07427
@@ -12,26 +13,27 @@ EBUILD feedparser-5.0.1.ebuild 1705 SHA256 a9c325cae00ff3cff683dcbe6d2de457efe86
 EBUILD feedparser-5.1.1.ebuild 1594 SHA256 f14541a76e590cceb3331d8fae2897e94b1055b77569bc8e57ea83d5aeb3c337 SHA512 ce81aab1f1eda18d2ba1fc842fec39bda184696528993f0a66acffe890b0a91ec80863f221ab8a840a582ea2f0113e67fd98fa4b092b120aa5cbbb37e3e6bb94 WHIRLPOOL 9db07ebddc5f314b21ecbb5fd7ac820eb39dc61477725914537c0b7fdf467f846ca3537ec5748b69a10fa5504a26e1174ed7918f53f7174e1312592feab65c29
 EBUILD feedparser-5.1.2.ebuild 1588 SHA256 c612e1556842679bb17046ab1fb08a6ae2582ee9bf8d2266a8ae28295b7fec50 SHA512 3f034f95e60f302c03f4c13ead24dfb65b6a5476e39dd6773aca5b76ce5127a36d120a6722ca3cb516a156b4cfff144716ae46fab602685a1ecbaa352094f5b7 WHIRLPOOL fc840b6b516bf053c5c9c9eececa8e9ed22eeaefdda2c0cedeac62084071ff0c1976e1cc259f11ca6579fa4076330cbe201f6495c200ca742712fd664373b855
 EBUILD feedparser-5.1.3-r1.ebuild 1344 SHA256 01ac1e5d10a0a715853f18050e4465e16ac0b2f5664e9e734b091ae34055993c SHA512 e8f664f515b40a535919dd4bfb8b50727c067eae51ac3fe8c68241cb8af9e3b11908cbb449a772231f7ce29b079bb3ca655799393841a33183910368062034eb WHIRLPOOL 32462182d7f402704be5c16fb31b2a19e41e2f935d4f3be26c4402fdaa00eaf531e19ead92dd26435331e9edb0a4fce43ac8ded1cf2c1b61e17281386b02734b
+EBUILD feedparser-5.1.3-r2.ebuild 1417 SHA256 379329b9901dd1b9d4bf41dd8cba4f34c3931ae5dd6dd9ab929c7288deceb682 SHA512 f954f0e3c5aef39340d76520a9f53085668a3bb007db8e0f72fe826b81fa1e53389088cafd0b5bb5c36356751de8bf6e90f3dbc63180d5bd5e6fb2fb04bcb1a7 WHIRLPOOL 272ac0b10889c9ab3cabd7ac026e06ade9780d718fa9ff2f0cf7bc95ec5b333d597fe272b0db8c5c21e7625d3d1e7542c6b99c589ef63920b5440a2b4d9abb71
 EBUILD feedparser-5.1.3.ebuild 1602 SHA256 c98d1ef895395b4a71a54f534c9cada8d608a1f89b06adb74faa005a4b0f5f0e SHA512 170ddccd45788c8a01b175d9cc2399fbc771eaa3c22d761503749493bee63e2ec8b20bbf06eca98d0576830c28e6d84b1d172208b11fc8948d70cf43042c5716 WHIRLPOOL 16b662cc68c10508cb6a8859d1f2f7b34c6eaf9e6722266728be577cb02b026f41e7ecd97b064c3f437cc5e0757ce097b44f5b764a0b3418a703fed146f6eaf5
 EBUILD feedparser-5.1.ebuild 1589 SHA256 0d86c336cb63d02a878d3c44a1ecee5779bddec9a58fc8f83bb22b3890458882 SHA512 a78830a9b34e126e0457d057e84bafde903b736e13ad681f34582a8469a024832ae8bd7b77a146bd31c19cae2d42d1b686629a1f1cf94258837b8b3fc4b5823e WHIRLPOOL 765d52e5bb505416defc45484fefc6847046298ce4e2c8d24833c0d38337788f3b8b418b88ab47af98e1c4b4973459b8a9d64908e9853eb3887651a6fc0ea2da
-MISC ChangeLog 6373 SHA256 0205274f7ac905c8eec44c7f4d773af948860afb56cf33f41f9bca3f5e750162 SHA512 d7ee4c2d2932e1ff1baf5d3d06968f5bcc52d43ed646242368866ce814799ea8ba2b2aca4e201e0eee2447b3666b4e797629cc415b3771d3814969cbd1fe22f7 WHIRLPOOL 78c24bd3614fa93016b3259176dc73aa4d2e86d75e9c5f07561617fdaabc91e649b8bea5867b6ed62165cbe40b423ea2ebeb6358b8c62ed8108f2ef1e1bc9f23
-MISC metadata.xml 342 SHA256 d0f39816274e6cdfe0702286d867eb606092b53838800669184280a1f0111a1e SHA512 b9b1f60d1e542fd1ce805b50732aad99d1b2b15811b97d247eb90037e084ddb44c2008801b72d974d0f2dff9c3cabeae56df465b7017693a8d0dcc10b116e2bf WHIRLPOOL 6bc98a0d1a956852c9ce48ece0a857792033969e80433ab8529f41f00e50728311502a938adecf96a79c7540cbb18185880946711953799030dc38aef65d0b83
+MISC ChangeLog 6593 SHA256 63dc403b047500506c6088d8f3745e15847b7446db47a3402e27930eef959de2 SHA512 4cd2c6aef239e35f71bd0182e02e6412d1a37b7e442a9d2b841af87350862f08c3b21ce3db5a32e39a569f67687c0c92390e19c39f9016f525f439b0bf1645a7 WHIRLPOOL e147678f0bd16899e1e76b5cd5f98c8a276c71d9e3ded24870b1c08127a5fb699bc5ad94874b39dc2792345a994de9640c3c3ac557899e7712acc4cf8412be44
+MISC metadata.xml 348 SHA256 caf578b932a4f912bca38f01aaeb33387a2f4e11f1029fb62f19641f9e473a04 SHA512 be56f35b6dd6399e7ed5480daf1ff97d3b9d33541f93e569b4e11458798ff68a3243cc6017db1e2f0ed17fc20b9e89fa34aa55f967b5cf77e3a3f82f54baa810 WHIRLPOOL 50583ecaac47a3722874296d06d9e4491eb91c1cd49bb2ba6204365fa9a520e3156353d6d6c3eca2071ae2643eeff02e7f225c9a229a4ef30c31bbfce035cece
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSKNKJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO7ysP/iO7+FqXYXnmkiFcKX/Jh6Pn
-aDdb7ytk/fB+JT1iBSzcKbCjSU7WSBZ3L5QqheSzysMXPy3HKB73VTb4TnSKkiXo
-Q+VfWimTpUgS3pcqKcvvKeFt7tWbwlVLsCrtO4Nm681xBG/vT55S/I1OmIrKnn/R
-vNaaG5B8Poe2HK1MMvWNj5NgD075po6ql1skDa48mJ80wqIWUp+0USP0+2ESCB7s
-vepW6GE/ZTD1OMdTOXfQsku57+R+VsiPYEj/T7IQjjO+MH2YuJcYPPNfJ30z8wvp
-z2M1dPGhm/t8A3kazRY5qReUo28RLGsPAmJWLCb8G9McNarXHqjv5Hp/4I5djIef
-x9NhwV0KNDOdSaNafkLLjwhL7T3+p/TGCc7dK2l3elpkTdhkjaQocsn/CqGRN34H
-haeHEhWorlwaQRh/IXppKp1zwLmTGhmYF0pQ7Gc1OoH/EMRjxZjRMU1galKUSJaW
-1wMjox3tX5Vute0V3I/BhXLwhClry0XL04et0nf12pCCB86zDWWFPJKvHsTTZW2X
-BSmu4/SC4VaeTBnNvDh9wwHA9lZxlIsNGc+nZWsBl1nJwvQx/mIlrbzd8WP+Lj2x
-oTb0ol+zupBEOrXQ1LbTZsOlAzd69sJs3dFjqD06rBjeYIEXyT302ZR3s8PrpTm8
-88zwQ3FeY8i9EC018qAm
-=+cFf
+iQJ8BAEBCgBmBQJTCwtvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirImwP/0cVn0wQMd95cFgBrPAuWDiS
+BVSGvEYLHalgm3lWAM5oSKV5fI4NJtvMamSvv354HkMdt/nkmPKz3PFEWGCD0HaP
+bEc0jI9O81rDwI7QM0VxNvE5323vVJnuRee/WnQYCCqr+FBne4HChEHg+j/GxpoY
+qWU6numILfP7FT+ipqgZwD2rId7w7fKt+13rULE6+rx/7ajFf9hoii7KrWgvOtOv
+qj3BuCIc7RI02HcsKLkYIHzN9wwy0NjwOHwQFjX8EFI6NJ7ii1i0Q15TFnW74AxN
+0oFXTrbIxzw26PsCADDZA9gG0Wu2YJozv/rQ4beLlh0WCRaKWXws9VPs5vUubUvn
+JMqpF9jmft4p4XW5oL8dEC/h9jNOWLUBgksf7/pfO+Gc/EL152J1325uo7TzUHdM
+IB1Z17R1j9RwUOeW6wXry46mKJTFNsZlLT79Rnv+C1Vbltog19Xk6Kc/joN4Lz7m
+0xBw/PgjQb422sDKD3tBEu09egfr8a+o/G9dZ0Y+WdHzvaQAuSS26d9rY0NPxdzf
+6y7O1WyycIUYivwLKZXyZ3+4Hy/NjTmBk5ZlPwMrR+b1iuUOomRSUb/G95qmQsCY
+h7GIvxAocymmqBjJ8na/+tqX6GWWpFLTvxZi5q8154vcEkp/fh4Txnm6PHVjzZn6
+yL7sMbMUcxdNBIEb7VLI
+=PJPZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/feedparser/feedparser-5.1.3-r2.ebuild b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
new file mode 100644
index 000000000000..f419db1884e7
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.1.3-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.3-r2.ebuild,v 1.1 2014/02/24 09:05:50 jlec Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_{6,7},3_{2,3}} pypy2_0 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Parse RSS and Atom feeds in Python"
+HOMEPAGE="http://code.google.com/p/feedparser/ http://pypi.python.org/pypi/feedparser"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
+
+# sgmllib is licensed under PSF-2.
+LICENSE="BSD-2 PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+# Tests have issues with chardet installed, and are just kind of buggy.
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-backport_fix_for_chardet-py3.patch
+)
+
+python_prepare_all() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die
+	epatch "${FILESDIR}/${PN}-5.1-sgmllib.patch"
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp feedparser/feedparsertest.py "${BUILD_DIR}" || die
+	ln -s "${S}/feedparser/tests" "${BUILD_DIR}/tests" || die
+	cd "${BUILD_DIR}" || die
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 --no-diffs -w -n feedparsertest.py || die
+	fi
+	"${PYTHON}" feedparsertest.py || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch b/dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch
new file mode 100644
index 000000000000..6b03ddea8cbb
--- /dev/null
+++ b/dev-python/feedparser/files/feedparser-5.1.3-backport_fix_for_chardet-py3.patch
@@ -0,0 +1,32 @@
+From 20a32910f4a521788ba93a8c809cf0db702bed5b Mon Sep 17 00:00:00 2001
+From: Kurt McKee <contactme@kurtmckee.org>
+Date: Mon, 17 Dec 2012 10:41:13 -0600
+Subject: [PATCH] Fix chardet support in Python 3
+
+Fixes issue 384.
+Thanks to Google user Arfrever.TFA for reporting this!
+---
+ NEWS                     | 1 +
+ feedparser/feedparser.py | 6 +++++-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py
+index c78e6a3..e977ae8 100644
+--- a/feedparser/feedparser.py
++++ b/feedparser/feedparser.py
+@@ -3766,7 +3766,11 @@ def convert_to_utf8(http_headers, data):
+     chardet_encoding = None
+     tried_encodings = []
+     if chardet:
+-        chardet_encoding = unicode(chardet.detect(data)['encoding'] or '', 'ascii', 'ignore')
++        chardet_encoding = chardet.detect(data)['encoding']
++        if not chardet_encoding:
++            chardet_encoding = ''
++        if not isinstance(chardet_encoding, unicode):
++            chardet_encoding = unicode(chardet_encoding, 'ascii', 'ignore')
+     # try: HTTP encoding, declared XML encoding, encoding sniffed from BOM
+     for proposed_encoding in (rfc3023_encoding, xml_encoding, bom_encoding,
+                               chardet_encoding, u'utf-8', u'windows-1252', u'iso-8859-2'):
+-- 
+1.8.5.5
+
diff --git a/dev-python/feedparser/metadata.xml b/dev-python/feedparser/metadata.xml
index d9c28faf09de..ec031c36b1f8 100644
--- a/dev-python/feedparser/metadata.xml
+++ b/dev-python/feedparser/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<longdescription>Parse RSS and Atom feeds in Python. 2000 unit tests. Open source.</longdescription>
-	<upstream>
-		<remote-id type="google-code">feedparser</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <longdescription>Parse RSS and Atom feeds in Python. 2000 unit tests. Open source.</longdescription>
+  <upstream>
+    <remote-id type="google-code">feedparser</remote-id>
+  </upstream>
 </pkgmetadata>