summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2009-10-11 09:45:58 +0000
committerFabian Groffen <grobian@gentoo.org>2009-10-11 09:45:58 +0000
commit994fe03e076422f6020f68c3f98bbb69aad11da4 (patch)
tree0660640408160ade7f93fed77b1c3d6c946dc250 /dev-python/pycairo
parentAutomated update of use.local.desc (diff)
downloadhistorical-994fe03e076422f6020f68c3f98bbb69aad11da4.tar.gz
historical-994fe03e076422f6020f68c3f98bbb69aad11da4.tar.bz2
historical-994fe03e076422f6020f68c3f98bbb69aad11da4.zip
Merge from Prefix
Package-Manager: portage-2.2.00.14552-prefix/cvs/Darwin powerpc RepoMan-Options: --force
Diffstat (limited to 'dev-python/pycairo')
-rw-r--r--dev-python/pycairo/ChangeLog5
-rw-r--r--dev-python/pycairo/pycairo-1.8.8.ebuild9
2 files changed, 9 insertions, 5 deletions
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index fed4f8d2c4bd..423490fb046b 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/pycairo
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.80 2009/10/07 17:59:59 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.81 2009/10/11 09:37:29 grobian Exp $
+
+ 11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pycairo-1.8.8.ebuild:
+ Merge from Prefix
07 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild:
diff --git a/dev-python/pycairo/pycairo-1.8.8.ebuild b/dev-python/pycairo/pycairo-1.8.8.ebuild
index da3cf5f3f64b..a2ba33a8e04c 100644
--- a/dev-python/pycairo/pycairo-1.8.8.ebuild
+++ b/dev-python/pycairo/pycairo-1.8.8.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/pycairo/pycairo-1.8.8.ebuild,v 1.11 2009/10/07 17:59:59 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.8.8.ebuild,v 1.12 2009/10/11 09:37:29 grobian Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples svg"
RDEPEND=">=x11-libs/cairo-1.8.8[svg?]"
@@ -68,7 +68,8 @@ src_test() {
}
src_install() {
- PKGCONFIG_DIR="/usr/$(get_libdir)/pkgconfig" distutils_src_install
+ [[ -z ${ED} ]] && local ED=${D}
+ PKGCONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" distutils_src_install
if use doc; then
dohtml -r doc/.build/html/ || die "dohtml -r doc/.build/html/ failed"
@@ -80,7 +81,7 @@ src_install() {
insinto /usr/share/doc/${PF}/examples
doins -r examples/*
- rm "${D}"/usr/share/doc/${PF}/examples/Makefile*
+ rm "${ED}"/usr/share/doc/${PF}/examples/Makefile*
fi
# dev-python/pycairo-1.8.8 doesn't install __init__.py automatically.