diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-22 23:58:12 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-22 23:58:12 +0000 |
commit | 58ec1b1a2bd3673001c9718ff621186b8bc5e2f0 (patch) | |
tree | 3c6fd315e54222306761586edca447250d5a29d9 | |
parent | Fix prefix support (diff) | |
download | historical-58ec1b1a2bd3673001c9718ff621186b8bc5e2f0.tar.gz historical-58ec1b1a2bd3673001c9718ff621186b8bc5e2f0.tar.bz2 historical-58ec1b1a2bd3673001c9718ff621186b8bc5e2f0.zip |
Fix tests with Python 2.6 (bug #298032). Set SUPPORT_PYTHON_ABIS.
Package-Manager: portage-15132-svn/cvs/Linux x86_64
-rw-r--r-- | dev-python/html5lib/ChangeLog | 9 | ||||
-rw-r--r-- | dev-python/html5lib/Manifest | 5 | ||||
-rw-r--r-- | dev-python/html5lib/files/html5lib-0.11.1-python-2.6.patch | 19 | ||||
-rw-r--r-- | dev-python/html5lib/html5lib-0.11.1-r1.ebuild (renamed from dev-python/html5lib/html5lib-0.11.1.ebuild) | 36 |
4 files changed, 51 insertions, 18 deletions
diff --git a/dev-python/html5lib/ChangeLog b/dev-python/html5lib/ChangeLog index fb621daf3590..a764d9d644d1 100644 --- a/dev-python/html5lib/ChangeLog +++ b/dev-python/html5lib/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/html5lib # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/ChangeLog,v 1.2 2009/06/28 21:28:02 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/ChangeLog,v 1.3 2009/12/22 23:58:12 arfrever Exp $ + +*html5lib-0.11.1-r1 (23 Dec 2009) + + 23 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + -html5lib-0.11.1.ebuild, +html5lib-0.11.1-r1.ebuild, + +files/html5lib-0.11.1-python-2.6.patch: + Fix tests with Python 2.6 (bug #298032). Set SUPPORT_PYTHON_ABIS. 28 Jun 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> html5lib-0.11.1.ebuild: diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest index b76da1ef5bbe..5785d8575a51 100644 --- a/dev-python/html5lib/Manifest +++ b/dev-python/html5lib/Manifest @@ -1,4 +1,5 @@ +AUX html5lib-0.11.1-python-2.6.patch 611 RMD160 8e47a4fb67e97e3b45fb24e6a817c0a50ed453a3 SHA1 2205630082917be41abf035f96b657fa5ae75637 SHA256 23709da492b2733e82a060212ba18f8e5ed04c93a08f18c09446aff15abf8e0f DIST html5lib-0.11.1.zip 375892 RMD160 ac00975e5ea8b20606531e631274c1a8985110c9 SHA1 157506319e40f5d973c128e5e2b826cd1bee471e SHA256 e5a26cb5eda1101871ea3a1199de47311f75e72921583d417b44bcff60f8746e -EBUILD html5lib-0.11.1.ebuild 1014 RMD160 0d8b9ad0c31be7ef67085f23e8e6170227f566c1 SHA1 7c5f145139ded67ca41ed237ea46debd8221df56 SHA256 295c8d036c5f1e822781ebd9341c42bd235ef6b1876fc8f07d9e586c8aa337cd -MISC ChangeLog 584 RMD160 cd8e0fb820cbce4510f8880a20c1b74775f6a98d SHA1 704a53a7713eea64dfce7d4357241d787d6dfc42 SHA256 2798ba0327c44295844886328cac71373e71b8fd147bbe15dab5b9f57b7718ab +EBUILD html5lib-0.11.1-r1.ebuild 1126 RMD160 91bb179dca6bca2b18bc997bf9cf9ce06cbf44da SHA1 f8bd39a697429d6ecd5bbd70d15eac8b06e3d4e6 SHA256 c3c335bf48205a987aa5c16fdd8356791793f7185097b93fb1bc7d5ca117a0f4 +MISC ChangeLog 859 RMD160 d3030c70d0c0da8b6e52089596ad9804f9c9393a SHA1 334b7f30616b6b85f5f219e23ffed0055062320c SHA256 9ddba080b1c1378253132ad72a2eb57b4767ca7e901dc65b22a7a4b5e56dac5e MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a diff --git a/dev-python/html5lib/files/html5lib-0.11.1-python-2.6.patch b/dev-python/html5lib/files/html5lib-0.11.1-python-2.6.patch new file mode 100644 index 000000000000..f3c2800e46e6 --- /dev/null +++ b/dev-python/html5lib/files/html5lib-0.11.1-python-2.6.patch @@ -0,0 +1,19 @@ +changeset: 1249:77f13a977be6 +user: jgraham@jgraham-desktop +date: Wed Apr 29 17:17:24 2009 +0200 +summary: Fix deprecation warning + +--- src/html5lib/inputstream.py ++++ src/html5lib/inputstream.py +@@ -444,8 +444,10 @@ + """String-like object with an assosiated position and various extra methods + If the position is ever greater than the string length then an exception is + raised""" ++ def __new__(self, value): ++ return str.__new__(self, value) ++ + def __init__(self, value): +- str.__init__(self, value) + self._position=-1 + + def __iter__(self): diff --git a/dev-python/html5lib/html5lib-0.11.1.ebuild b/dev-python/html5lib/html5lib-0.11.1-r1.ebuild index 3e2b1a31f9b6..cbf3e971a1ec 100644 --- a/dev-python/html5lib/html5lib-0.11.1.ebuild +++ b/dev-python/html5lib/html5lib-0.11.1-r1.ebuild @@ -1,40 +1,46 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.11.1.ebuild,v 1.4 2009/06/28 21:28:02 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.11.1-r1.ebuild,v 1.1 2009/12/22 23:58:12 arfrever Exp $ EAPI="2" +SUPPORT_PYTHON_ABIS="1" -NEED_PYTHON="2.4" - -inherit distutils +inherit distutils eutils DESCRIPTION="HTML parser based on the WHAT-WG Web Applications 1.0 HTML5 specification" HOMEPAGE="http://code.google.com/p/html5lib/" SRC_URI="http://${PN}.googlecode.com/files/${P}.zip" + LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="examples test" -# simplejson will be bundled with Python 2.6 -RDEPEND=" - test? ( dev-python/simplejson )" +RDEPEND="dev-lang/python[xml]" DEPEND="${RDEPEND} app-arch/unzip >=dev-python/setuptools-0.6_rc5 - dev-lang/python[xml]" + test? ( dev-python/simplejson )" +RESTRICT_PYTHON_ABIS="3.*" + +src_prepare() { + distutils_src_prepare + epatch "${FILESDIR}/${P}-python-2.6.patch" +} + +src_test() { + testing() { + "$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" test + } + python_execute_function testing +} src_install() { distutils_src_install if use examples ; then - $(find examples -name '*.pyc' -exec rm -rf {} ';') + find examples -name "*.pyc" | xargs rm -fr insinto "/usr/share/doc/${PF}" - doins -r examples || die "Failed to install examples" + doins -r examples || die "Installation of examples failed" fi } - -src_test() { - distutils_python_version - "${python}" setup.py test || die "tests failed" -} |