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 | 1212e5e929c8bb780ceea0f1d71bebfc681a39ca (patch) | |
| tree | 592639cd73718994d5cc59bfc9c808ff6b7953ee /dev-python/pyxml | |
| parent | Delete older ebuilds. (diff) | |
| download | historical-1212e5e929c8bb780ceea0f1d71bebfc681a39ca.tar.gz historical-1212e5e929c8bb780ceea0f1d71bebfc681a39ca.tar.bz2 historical-1212e5e929c8bb780ceea0f1d71bebfc681a39ca.zip | |
Fix tests with Python 2.7 (bug #298930).
Package-Manager: portage-15154-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pyxml')
| -rw-r--r-- | dev-python/pyxml/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pyxml/Manifest | 6 | ||||
| -rw-r--r-- | dev-python/pyxml/pyxml-0.8.4-r2.ebuild | 12 |
3 files changed, 15 insertions, 9 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/Manifest b/dev-python/pyxml/Manifest index 581535a34039..224fd4ecacf6 100644 --- a/dev-python/pyxml/Manifest +++ b/dev-python/pyxml/Manifest @@ -1,7 +1,5 @@ AUX pyxml-0.8.4-python-2.6.patch 1749 RMD160 f8eb2f581a953e8a2b2968cea9a88fe5a1353243 SHA1 787a92081dd172aa36d5c52344e74ef922073bc0 SHA256 03c4eb073c58e7c28a22ff702a296ba4c4fe11a64d931ada6216d1876c6118e8 DIST PyXML-0.8.4.tar.gz 734954 RMD160 976e618d99fb29840e36eb2c7662c1d0a1f2bca9 SHA1 6f30d5907b75ef76809c19e0103d78f4a5fb027c SHA256 9fab66f9584fb8e67aebd8745a5c97bf1c5a2e2e461adf68862bcec64e448c13 -EBUILD pyxml-0.8.4-r1.ebuild 1371 RMD160 fdde2993331618bb2b2eabc579045e01ab96d102 SHA1 bb205a770e9d407c904fa0ce8e4ddbebebb2aed5 SHA256 003afc6727aa492befd5a2e5c113094dfc59e92439db7fd2b82057283e3d005e -EBUILD pyxml-0.8.4-r2.ebuild 1704 RMD160 c146c37989982783f985c422de144800b0b41f85 SHA1 091b615a390ec97e259841456d3e46bd257aaf86 SHA256 a9ceb6ad54a8e45a7c33209699577c9ef73ddda8e184806f755f0f3d32aa5852 -EBUILD pyxml-0.8.4.ebuild 1130 RMD160 194c2df5365f3f1c29f4900f8f5ceb2f4c22dbdc SHA1 374ef58d541f87b12f83f2089c5d0f19ef6a71d5 SHA256 158305cadf34bdbe4123b9f4753bfb64e75bb85de0a2cb7395c57cd3bc8e6987 -MISC ChangeLog 8673 RMD160 1ce3f865db62f70fc67e87cc08958d9a4e1ffbf3 SHA1 6ac4ab16834996e2b5bc902fe6fe0a11467f499a SHA256 5e4778f16695f876132f01a42f59c6ffb8d2c98c85525d8c5e612ebf53fdd1fb +EBUILD pyxml-0.8.4-r2.ebuild 1793 RMD160 8dcf6bb6911c6d6a9e37d09723bc073ae7ba02ff SHA1 a87f2bd8b4ddb466c26a40db46bb9dbadb7fa725 SHA256 37b231bc7b82e44698498930783a1368dc0dabab5d7114c73abe7deff88c4e58 +MISC ChangeLog 8816 RMD160 56f1849030f9ddefd27996c05862528699447843 SHA1 f8e68d2d9e4198f01780dadb2917713cfccb793d SHA256 00d3dbfc0a2bac52e87041af91ba71c4f95a318b46b591b4cc476d747030f24a MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 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}" } |