Version bump for bug 393639. Thanks to Johan Bergström and Arfrever. Includes patch by sping. Fails tests.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 146 insertions, 5 deletions

diff --git a/dev-python/feedparser/ChangeLog b/dev-python/feedparser/ChangeLog
index 74e5bf1914a9..48830d4b0ae3 100644
--- a/dev-python/feedparser/ChangeLog
+++ b/dev-python/feedparser/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/feedparser
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/ChangeLog,v 1.32 2012/01/02 05:28:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/ChangeLog,v 1.33 2012/01/03 04:18:13 floppym Exp $
+
+*feedparser-5.1 (03 Jan 2012)
+
+  03 Jan 2012; Mike Gilbert <floppym@gentoo.org> +feedparser-5.1.ebuild,
+  +files/feedparser-5.1-sgmllib.patch:
+  Version bump for bug 393639. Thanks to Johan Bergström and Arfrever. Includes
+  patch by sping. Fails tests.
 
   02 Jan 2012; Mike Gilbert <floppym@gentoo.org> Manifest:
   Fix manifest
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index c0735e4a57be..488e85c00cc0 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX feedparser-5.0.1-sgmllib.patch 932 RMD160 f1e54d39aee105902308955b4d41b2b628c59904 SHA1 4bc4f692a7e852dc44860755aab03f5b74e968bf SHA256 5ebe73ace12773111ce625c3becee8835219156d732237f678fe9457c33b88db
+AUX feedparser-5.1-sgmllib.patch 2745 RMD160 f448867e4ad263a0d81e876ce5238ccd4f163896 SHA1 9cde8ee59836866a215746b975d5f5e1dc7a3a1e SHA256 1eddd093e40096c9f7592d264c458a2d0c42311fb9f204ec4622e9bf8f494256
 DIST feedparser-5.0.1.tar.bz2 204146 RMD160 1ab459dd969a3364c64b9d67f15559a1dfdf958b SHA1 3ab34ba314260cc79b2f558dec7ddc7037098b44 SHA256 57fe918773969eb20fb7b94ab1ae5d3b7eb4a8ce29f49ebc3766fa7f6a4974cb
+DIST feedparser-5.1.tar.bz2 195506 RMD160 bd6a8f71d5077ab8032c26916b60ef16ba2ff31f SHA1 b63284f2b93ab1c92cbd74879de0efe0b37da366 SHA256 91a28a76b5cbaf7457a22e47e04347568a1f21fac85c806867ac72d32aabe718
 EBUILD feedparser-5.0.1.ebuild 1705 RMD160 65963b60858f81a00f9fcdee180fc1b69755813a SHA1 59435c808ebe984a828a6bf98f97e36a9eee439d SHA256 a9c325cae00ff3cff683dcbe6d2de457efe861ef992d12dc4c4ecc69f32cf6b7
-MISC ChangeLog 4296 RMD160 1afa67456234e85b4d08836b9dd2ce1710b1393c SHA1 78fc58911ff36da5dcf6161cb1b1861709b3ef38 SHA256 068dfa59878609aa170a7d9ecf88506589f62788925f9719e186a438a3b6a652
+EBUILD feedparser-5.1.ebuild 1589 RMD160 002f87a7303eb6f9dc3fb03b57d5df550ea8dc01 SHA1 e78b91202f6fd3bb2f66bbf460d22614ec755261 SHA256 0d86c336cb63d02a878d3c44a1ecee5779bddec9a58fc8f83bb22b3890458882
+MISC ChangeLog 4552 RMD160 6c686fd69270f8a78cd68c1da7390e5c12863f98 SHA1 256bdce80b491feec1a641129f65d96ad0f82715 SHA256 b157003d7f0d21303c22f6f408d90bbe96ccf41405ccf43a84df0ef30bf24e9a
 MISC metadata.xml 262 RMD160 a3cefad4b9969818c51b29821e04decd168b8d42 SHA1 f111433d863b3a2ee100bddbfd6726901ec35712 SHA256 663d5f1be72528c4e41547424ce620b40f15c584f2d543c8f61fe3e78a46475e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8BQHkACgkQC77qH+pIQ6Rc/wEAoGIOPn/c5//JLUvcZgnkodOl
-asG7en61tqd1n2i5fK0BAIYQrJQIxtMqPx96hTkSbH08g3HdercZklbhJcHxDN5k
-=vUti
+iF4EAREIAAYFAk8CgYoACgkQC77qH+pIQ6TxQwD9EhAKr4XVWjPMx030mfYxS0n7
+l16IOGyqr0XR9LTqIYcA/ApfNM8dWD+r4kN02dbZ6JE+QeDGPkLGXSnITEWCT0lQ
+=YI+U
 -----END PGP SIGNATURE-----
diff --git a/dev-python/feedparser/feedparser-5.1.ebuild b/dev-python/feedparser/feedparser-5.1.ebuild
new file mode 100644
index 000000000000..00b36f377834
--- /dev/null
+++ b/dev-python/feedparser/feedparser-5.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-5.1.ebuild,v 1.1 2012/01/03 04:18:13 floppym Exp $
+
+EAPI="4"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_TESTS_RESTRICTED_ABIS="*-jython"
+PYTHON_TESTS_FAILURES_TOLERANT_ABIS="*"
+
+inherit distutils 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"
+RDEPEND=""
+
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+PYTHON_MODNAME="feedparser.py _feedparser_sgmllib.py"
+
+src_prepare() {
+	mv feedparser/sgmllib3.py feedparser/_feedparser_sgmllib.py || die "Renaming sgmllib3.py failed"
+	epatch "${FILESDIR}/${P}-sgmllib.patch"
+
+	sed -e "/import feedparser/isys.path.insert(0, '../build/lib')" -i feedparser/feedparsertest.py
+
+	distutils_src_prepare
+
+	preparation() {
+		if [[ "${PYTHON_ABI}" == 3.* ]]; then
+			2to3-${PYTHON_ABI} -nw --no-diffs feedparser/feedparsertest.py
+		else
+			# Avoid SyntaxErrors with Python 2.
+			echo "raise ImportError" > feedparser/_feedparser_sgmllib.py
+		fi
+	}
+	python_execute_function -s preparation
+}
+
+src_test() {
+	testing() {
+		cd feedparser || return 1
+		"$(PYTHON)" feedparsertest.py
+	}
+	python_execute_function -s testing
+}
diff --git a/dev-python/feedparser/files/feedparser-5.1-sgmllib.patch b/dev-python/feedparser/files/feedparser-5.1-sgmllib.patch
new file mode 100644
index 000000000000..63c12ba0c362
--- /dev/null
+++ b/dev-python/feedparser/files/feedparser-5.1-sgmllib.patch
@@ -0,0 +1,78 @@
+From 812793c07d3202d3f5bc39091aec2e7071d000c8 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 1 Jan 2012 19:30:57 +0100
+Subject: [PATCH] Use shipped sgmllib for Python 3.x
+
+---
+ feedparser/feedparser.py |   19 +++----------------
+ setup.py                 |    2 +-
+ 2 files changed, 4 insertions(+), 17 deletions(-)
+
+diff --git a/feedparser/feedparser.py b/feedparser/feedparser.py
+index 8275c29..9a8a053 100644
+--- a/feedparser/feedparser.py
++++ b/feedparser/feedparser.py
+@@ -204,17 +204,9 @@ else:
+ try:
+     import sgmllib
+ except ImportError:
+-    # This is probably Python 3, which doesn't include sgmllib anymore
+-    _SGML_AVAILABLE = 0
++    import _feedparser_sgmllib as sgmllib
+ 
+-    # Mock sgmllib enough to allow subclassing later on
+-    class sgmllib(object):
+-        class SGMLParser(object):
+-            def goahead(self, i):
+-                pass
+-            def parse_starttag(self, i):
+-                pass
+-else:
++if True:
+     _SGML_AVAILABLE = 1
+ 
+     # sgmllib defines a number of module-level regular expressions that are
+@@ -2520,9 +2512,6 @@ class _RelativeURIResolver(_BaseHTMLProcessor):
+         _BaseHTMLProcessor.unknown_starttag(self, tag, attrs)
+ 
+ def _resolveRelativeURIs(htmlSource, baseURI, encoding, _type):
+-    if not _SGML_AVAILABLE:
+-        return htmlSource
+-
+     p = _RelativeURIResolver(baseURI, encoding, _type)
+     p.feed(htmlSource)
+     return p.output()
+@@ -2803,8 +2792,6 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
+ 
+ 
+ def _sanitizeHTML(htmlSource, encoding, _type):
+-    if not _SGML_AVAILABLE:
+-        return htmlSource
+     p = _HTMLSanitizer(encoding, _type)
+     htmlSource = htmlSource.replace('<![CDATA[', '&lt;![CDATA[')
+     p.feed(htmlSource)
+@@ -3890,7 +3877,7 @@ def parse(url_file_stream_or_string, etag=None, modified=None, agent=None, refer
+             result['bozo'] = 1
+             result['bozo_exception'] = feedparser.exc or e
+             use_strict_parser = 0
+-    if not use_strict_parser and _SGML_AVAILABLE:
++    if not use_strict_parser:
+         feedparser = _LooseFeedParser(baseuri, baselang, 'utf-8', entities)
+         feedparser.feed(data.decode('utf-8', 'replace'))
+     result['feed'] = feedparser.feeddata
+diff --git a/setup.py b/setup.py
+index a4a60fe..8c15451 100644
+--- a/setup.py
++++ b/setup.py
+@@ -16,7 +16,7 @@ setup(
+     download_url = 'http://code.google.com/p/feedparser/',
+     platforms = ['POSIX', 'Windows'],
+     package_dir = {'': 'feedparser'},
+-    py_modules = ['feedparser'],
++    py_modules = ['feedparser', '_feedparser_sgmllib'],
+     keywords = ['atom', 'cdf', 'feed', 'parser', 'rdf', 'rss'],
+     classifiers = [
+         'Development Status :: 5 - Production/Stable',
+-- 
+1.7.8.1
+