diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-10-11 11:31:35 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-10-11 11:31:35 +0000 |
| commit | bb0d86a8108792b30a9456b715521ba66298a0e2 (patch) | |
| tree | 6fb349aff02e43abdf26a6590d80770e61896f56 /dev-python/pyxml | |
| parent | ppc stable #282290 (diff) | |
| download | gentoo-2-bb0d86a8108792b30a9456b715521ba66298a0e2.tar.gz gentoo-2-bb0d86a8108792b30a9456b715521ba66298a0e2.tar.bz2 gentoo-2-bb0d86a8108792b30a9456b715521ba66298a0e2.zip | |
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'dev-python/pyxml')
| -rw-r--r-- | dev-python/pyxml/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/pyxml/pyxml-0.8.4-r2.ebuild | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-python/pyxml/ChangeLog b/dev-python/pyxml/ChangeLog index 6c4d114dfdb8..4ff8c746fca4 100644 --- a/dev-python/pyxml/ChangeLog +++ b/dev-python/pyxml/ChangeLog @@ -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: diff --git a/dev-python/pyxml/pyxml-0.8.4-r2.ebuild b/dev-python/pyxml/pyxml-0.8.4-r2.ebuild index 3b07f39f0b8d..8e0ec7280db0 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.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 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" 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 @@ src_compile() { 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_test() { } src_install() { + [[ -z ${ED} ]] && local ED=${D} distutils_src_install doman doc/man/* @@ -60,5 +61,5 @@ src_install() { 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} } |