Stable on amd64 x86 and ppc wrt bug#414633.

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

4 files changed, 17 insertions, 123 deletions

diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index 6ae696d07616..d7ccbab51ce2 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -1,17 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
-AUX cssutils-0.9.7-test.patch 3959 RMD160 5c3ef9a006c75b3a9c49d166c4d6770a1379ece3 SHA1 6297c2d09304705f2d023ca5a2f4f894af11c815 SHA256 8f8203849cff354a3d4c03aaaf50e006a0846a60f47a50be0baaedff6d9980ff
-DIST cssutils-0.9.7.zip 447664 RMD160 6119363eb9b8e38188cb8943c59d6d345681b227 SHA1 95a25352ab067c7b13aa82c5f6a5408cf82a2678 SHA256 2160d5a183862f3a91734f22391e937ff9accf115fd767705577ddd7ddbcb38b
 DIST cssutils-0.9.9.zip 426449 RMD160 0affdb2edc523e4f22d54d7a92ce81bccbeb76a6 SHA1 ac8d4ff2e56d7e4d4a37c6c1944cbdd5fdffabaa SHA256 f7061a591859c025504c7871ef3b843383a025d570128edf1c63a6ef53753e8d
-EBUILD cssutils-0.9.7.ebuild 1300 RMD160 3afc36b295dade1d85d5bc587c69eafd62623ee8 SHA1 90f0432a839583f61257dcff8e6b24116dd627e0 SHA256 6c3cb325cdf198302a7b6619ee72e5cb68baac3d4d41babdc0e8942fada0bbaa
-EBUILD cssutils-0.9.9.ebuild 1617 RMD160 0af538023c9ce48d9955d7c4a18c29d43475ae05 SHA1 f4ad92b5c5484bdb50fbb341fa7d4e97541e0c4b SHA256 2c9159c432f8cb8a7b9a8c1e2836831fa3f3e936461b4628693b58915094c735
+EBUILD cssutils-0.9.9.ebuild 1614 RMD160 6082c122c61ff0780b145f5161de426ae536362a SHA1 527f5826b50359aa71532e062c91caa99aa8fe05 SHA256 0c43f844f938f1da11efbd69715d94a41762752799821cb31be01ee53112eb0c
 MISC ChangeLog 4223 RMD160 2c64f35f937c6a6f243dae2593bff8f3ea5ac7ed SHA1 621ae33682473f186a828b54bb8cbc5835ba8fc0 SHA256 49e5a38837d69abc9e1056c49a26eb5a96e8c3ceb736fda75ff7a02f3db2ec83
 MISC metadata.xml 447 RMD160 f541e9c33f2a7781568b4cbf3ff5d97268df2b1c SHA1 4690998bcca3459c67cbc035f4d0203771cdac1f SHA256 c27a9286ab697d851fb6771bb9d408585c183ae6ba42d4e60411e7e2fc94337f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk93RvsACgkQuUQtlDBCeQLhgACdGq9WuQjgk21Msz4PX4wYCW3e
-rH4AnjUs33DKSiNSUGfemfQZ6FHdEdsU
-=7rkd
+iQIcBAEBAgAGBQJPpDDfAAoJEOSiRoyO7jvo8wcP/3lFwTlEcyfW9UsltORpUxOs
+QfbVWfGXSTZF5+kuatEYO8yBSB/cH1Q6jH9Fz96plFD7z4lF7BXHsDuqc4EJzSzr
+gn5XEGPr0p6WmIlEoR8lQzG/LLZx6RE2uEsrVjEBmlt4PftY72iUpgHGpm0TSsM1
+xHBpd+XJu/Rin7jgUOup1d4vIFoxHBA8B1sNUaaZSDxakbaQkowP1E8CmamQFNVC
+VJalei9cu+kvB8KjZPsPf11mbxzUCavKbjWB0K/ELXaSC1DvAo6vp15+s3c6n9Lc
+MU90K0V1hIUoUrVtqORbGl3sNrlbUyheAfCnpktizDNuHj66BzLcieIkWzOnUG+d
+DBeWAb++4x5fi4bip+bdzW7ncsgupT7toV9eptzI1ajO4uhymkfZlldhC16gdPd7
+UcnLAPeqUUZlm5UmVUGqhV+rTZoFawL3GvlzT3z1sjTv7/E4STh72OHK7rPjHEZE
+c4dmCtFmVN6X+y5hn5yEsuYwwp+7FhA6cqMSnPKBok2HkmHxtV0O/wUjSvzc1R+t
+zthdyZYGIPELAQgm7FiuUQyeWLpkVoN0Ygf/R/pSn9L2LA/Bu2O/J7WGsujOA6Rw
+wcF6IeGQTYMojQSy2UpkqeIdeeHNmYG4iorsSiUiYicDb8GETYEaNyRD4zzBfahP
+SudLKgiOFpBBtCjsVMUp
+=fLDr
 -----END PGP SIGNATURE-----
diff --git a/dev-python/cssutils/cssutils-0.9.7.ebuild b/dev-python/cssutils/cssutils-0.9.7.ebuild
deleted file mode 100644
index 38f18ec723c4..000000000000
--- a/dev-python/cssutils/cssutils-0.9.7.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.7.ebuild,v 1.8 2012/02/05 13:43:31 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-DISTUTILS_SRC_TEST="nosetests"
-
-inherit distutils eutils
-
-MY_P="${PN}-${PV/_alpha/a}"
-
-DESCRIPTION="CSS Cascading Style Sheets parser and library for Python"
-HOMEPAGE="http://code.google.com/p/cssutils http://pypi.python.org/pypi/cssutils"
-SRC_URI="http://cssutils.googlecode.com/files/${MY_P}.zip mirror://pypi/${PN:0:1}/${PN}/${MY_P}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-
-RDEPEND="dev-python/setuptools"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	test? ( dev-python/minimock )"
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_MODNAME="cssutils encutils"
-
-src_prepare() {
-	distutils_src_prepare
-
-	# Disable test failing with dev-python/pyxml installed.
-	if has_version dev-python/pyxml; then
-		sed -e "s/test_linecol/_&/" -i src/tests/test_errorhandler.py
-	fi
-
-	# Bug 386807.
-	epatch "${FILESDIR}/${P}-test.patch"
-}
-
-src_install() {
-	distutils_src_install
-
-	# Don't install tests.
-	delete_tests() {
-		rm -fr "${ED}$(python_get_sitedir)/tests"
-	}
-	python_execute_function -q delete_tests
-}
diff --git a/dev-python/cssutils/cssutils-0.9.9.ebuild b/dev-python/cssutils/cssutils-0.9.9.ebuild
index 2d0b2c82e348..e1901a94ba83 100644
--- a/dev-python/cssutils/cssutils-0.9.9.ebuild
+++ b/dev-python/cssutils/cssutils-0.9.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.9.ebuild,v 1.2 2012/03/04 17:20:10 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cssutils/cssutils-0.9.9.ebuild,v 1.3 2012/05/04 19:41:13 scarabeus Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="examples test"
 
 RDEPEND="dev-python/setuptools"
diff --git a/dev-python/cssutils/files/cssutils-0.9.7-test.patch b/dev-python/cssutils/files/cssutils-0.9.7-test.patch
deleted file mode 100644
index a93e44fa9c5a..000000000000
--- a/dev-python/cssutils/files/cssutils-0.9.7-test.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Fix some test failures. Adapted from:
-https://bitbucket.org/cthedot/cssutils/changeset/c944fbd1b309
-diff -ur cssutils-0.9.7.orig/examples/customlog.py cssutils-0.9.7/examples/customlog.py
---- examples/customlog.py	2010-11-27 18:23:40.000000000 +0800
-+++ examples/customlog.py	2011-12-23 02:11:47.863908828 +0800
-@@ -1,7 +1,7 @@
- import logging, StringIO

- 

- EXPOUT = ""

--EXPERR = u"Property: Unknown Property name. [1:5: x]\nHTTPError opening url=u'http://example.com/x': 404 Not Found\nCSSImportRule: While processing imported style sheet href=u'http://example.com/x': IOError('Cannot read Stylesheet.',)\nCSSStylesheet: CSSImportRule not allowed here. [1:13: @import]\n"

-+EXPERR = u"Property: Unknown Property name. [1:5: x]\nHTTPError opening url=u'http://cthedot.de/x': 404 Not Found\nCSSImportRule: While processing imported style sheet href=u'http://cthedot.de/x': IOError('Cannot read Stylesheet.',)\nCSSStylesheet: CSSImportRule not allowed here. [1:13: @import]\n"

- 

- def main():

-     import cssutils

-@@ -12,7 +12,7 @@
-     #cssutils.log.addHandler(h)

-     cssutils.log.setLevel(logging.INFO)

- 

--    sheet = cssutils.parseString('a { x: 1; } @import "http://example.com/x";')

-+    sheet = cssutils.parseString('a { x: 1; } @import "http://cthedot.de/x";')

-     #print mylog.getvalue()

- 

-     cssutils.log.removeHandler(h)

-diff -ur cssutils-0.9.7.orig/src/tests/test_parse.py cssutils-0.9.7/src/tests/test_parse.py
---- src/tests/test_parse.py	2010-11-27 18:23:36.000000000 +0800
-+++ src/tests/test_parse.py	2011-12-23 02:24:13.419840476 +0800
-@@ -96,15 +96,15 @@
-                 ('', None): (False, None, None), 

-                 ('1', None): (False, None, None), 

-                 ('mailto:a@bb.cd', None): (False, None, None), 

--                ('http://example.com/x.css', None): (False, None, None), 

--                ('http://example.com/x.css', ''): (True, u'utf-8', u''), 

--               # ('http://example.com/x.css', 'a'): (True, u'utf-8', u''), 

--#                ('http://example.com/x.css', 'a {color: red}'): (True, u'utf-8', 

--#                                                                 u'a {\n    color: red\n    }'), 

--#                ('http://example.com/x.css', 'a {color: red}'): (True, u'utf-8', 

--#                                                                 u'a {\n    color: red\n    }'), 

--#                ('http://example.com/x.css', '@charset "ascii";a {color: red}'): (True, u'ascii', 

--#                                                                 u'@charset "ascii";\na {\n    color: red\n    }'), 

-+                ('http://cthedot.de/test.css', None): (False, None, None), 

-+                ('http://cthedot.de/test.css', ''): (True, u'utf-8', u''),

-+                ('http://cthedot.de/test.css', 'a'): (True, u'utf-8', u''),

-+                ('http://cthedot.de/test.css', 'a {color: red}'): (True, u'utf-8',

-+                                                                u'a {\n    color: red\n    }'),

-+                ('http://cthedot.de/test.css', 'a {color: red}'): (True, u'utf-8',

-+                                                                 u'a {\n    color: red\n    }'),

-+                ('http://cthedot.de/test.css', '@charset "ascii";a {color: red}'): (True, u'ascii',

-+                                                                 u'@charset "ascii";\na {\n    color: red\n    }'),

-             }

-             override = 'iso-8859-1'

-             overrideprefix = u'@charset "iso-8859-1";'

-@@ -132,7 +132,7 @@
-                     self.assertEqual(sheet2, None)

- 

-             self.assertRaises(ValueError, parser.parseUrl, '../not-valid-in-urllib')

--            self.assertRaises(urllib2.HTTPError, parser.parseUrl, 'http://example.com/not-present.css')

-+            self.assertRaises(urllib2.HTTPError, parser.parseUrl, 'http://cthedot.de/not-present.css')

- 

-     def test_parseString(self):

-         "CSSParser.parseString()"