diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-30 01:40:59 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-12-30 01:40:59 +0000 |
| commit | 027a0d578c8140014ba6894f934ea99eb6fd0765 (patch) | |
| tree | 0aee2cfd793be582f09e612eff50bedf4c1eb909 /dev-python | |
| parent | Delete older ebuilds. (diff) | |
| download | gentoo-2-027a0d578c8140014ba6894f934ea99eb6fd0765.tar.gz gentoo-2-027a0d578c8140014ba6894f934ea99eb6fd0765.tar.bz2 gentoo-2-027a0d578c8140014ba6894f934ea99eb6fd0765.zip | |
Fix tests with Python 2.7 (bug #298930).
(Portage version: 15154-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/pyxml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pyxml/pyxml-0.8.4-r2.ebuild | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/dev-python/pyxml/ChangeLog b/dev-python/pyxml/ChangeLog index 4ff8c746fca4..dfafbf398732 100644 --- a/dev-python/pyxml/ChangeLog +++ b/dev-python/pyxml/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pyxml # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.59 2009/10/11 11:31:35 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.60 2009/12/30 01:40:59 arfrever Exp $ + + 30 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyxml-0.8.4-r2.ebuild: + Fix tests with Python 2.7 (bug #298930). 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyxml-0.8.4-r2.ebuild: Merge from Prefix diff --git a/dev-python/pyxml/pyxml-0.8.4-r2.ebuild b/dev-python/pyxml/pyxml-0.8.4-r2.ebuild index 8e0ec7280db0..231a84243304 100644 --- a/dev-python/pyxml/pyxml-0.8.4-r2.ebuild +++ b/dev-python/pyxml/pyxml-0.8.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v 1.11 2009/10/11 11:31:35 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v 1.12 2009/12/30 01:40:59 arfrever Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -29,7 +29,11 @@ PYTHON_MODNAME="_xmlplus" src_prepare(){ distutils_src_prepare + epatch "${FILESDIR}/${P}-python-2.6.patch" + + # Delete internal copy of old version of unittest module. + rm -f test/unittest.py } src_compile() { @@ -42,7 +46,7 @@ src_compile() { fi # use the already-installed shared copy of libexpat - distutils_src_compile --with-libexpat="${EPREFIX}"/usr ${myconf} + distutils_src_compile --with-libexpat="${EPREFIX}/usr" ${myconf} } src_test() { cd test @@ -53,7 +57,7 @@ src_test() { } src_install() { - [[ -z ${ED} ]] && local ED=${D} + [[ -z "${ED}" ]] && local ED="${D}" distutils_src_install doman doc/man/* @@ -61,5 +65,5 @@ src_install() { dohtml -A api,web -r doc/* insinto /usr/share/doc/${PF} && doins doc/*.tex fi - use examples && cp -r demo "${ED}"/usr/share/doc/${PF} + use examples && cp -r demo "${ED}usr/share/doc/${PF}" } |