[gentoo-commits] gentoo-x86 commit in dev-python/pyxml: ChangeLog pyxml-0.8.4-r2.ebuild

["Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@gentoo.org>]

arfrever    09/12/30 01:40:59

  Modified:             ChangeLog pyxml-0.8.4-r2.ebuild
  Log:
  Fix tests with Python 2.7 (bug #298930).
  (Portage version: 15154-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.60                 dev-python/pyxml/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/ChangeLog?rev=1.60&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/ChangeLog?rev=1.60&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/ChangeLog?r1=1.59&r2=1.60

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- ChangeLog	11 Oct 2009 11:31:35 -0000	1.59
+++ ChangeLog	30 Dec 2009 01:40:59 -0000	1.60
@@ -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



1.12                 dev-python/pyxml/pyxml-0.8.4-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?r1=1.11&r2=1.12

Index: pyxml-0.8.4-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pyxml-0.8.4-r2.ebuild	11 Oct 2009 11:31:35 -0000	1.11
+++ pyxml-0.8.4-r2.ebuild	30 Dec 2009 01:40:59 -0000	1.12
@@ -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 @@
 
 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 @@
 	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_install() {
-	[[ -z ${ED} ]] && local ED=${D}
+	[[ -z "${ED}" ]] && local ED="${D}"
 	distutils_src_install
 
 	doman doc/man/*
@@ -61,5 +65,5 @@
 		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}"
 }