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

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     09/10/11 11:31:36

  Modified:             ChangeLog pyxml-0.8.4-r2.ebuild
  Log:
  Merge from Prefix
  (Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)

Revision  Changes    Path
1.59                 dev-python/pyxml/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ChangeLog	23 Sep 2009 17:47:04 -0000	1.58
+++ ChangeLog	11 Oct 2009 11:31:35 -0000	1.59
@@ -1,6 +1,9 @@
 # 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.58 2009/09/23 17:47:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.59 2009/10/11 11:31:35 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyxml-0.8.4-r2.ebuild:
+  Merge from Prefix
 
   23 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pyxml-0.8.4-r2.ebuild:



1.11                 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.11&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild?r1=1.10&r2=1.11

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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pyxml-0.8.4-r2.ebuild	23 Sep 2009 17:47:04 -0000	1.10
+++ pyxml-0.8.4-r2.ebuild	11 Oct 2009 11:31:35 -0000	1.11
@@ -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.10 2009/09/23 17:47:04 arfrever Exp $
+# $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 $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -15,7 +15,7 @@
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND=">=dev-libs/expat-1.95.6"
@@ -42,7 +42,7 @@
 	fi
 
 	# use the already-installed shared copy of libexpat
-	distutils_src_compile --with-libexpat=/usr ${myconf}
+	distutils_src_compile --with-libexpat="${EPREFIX}"/usr ${myconf}
 }
 src_test() {
 	cd test
@@ -53,6 +53,7 @@
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	distutils_src_install
 
 	doman doc/man/*
@@ -60,5 +61,5 @@
 		dohtml -A api,web -r doc/*
 		insinto /usr/share/doc/${PF} && doins doc/*.tex
 	fi
-	use examples && cp -r demo "${D}"/usr/share/doc/${PF}
+	use examples && cp -r demo "${ED}"/usr/share/doc/${PF}
 }