summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Noël Rivasseau <elvanor@gentoo.org>2010-05-23 21:13:45 +0000
committerJean-Noël Rivasseau <elvanor@gentoo.org>2010-05-23 21:13:45 +0000
commit7197b49ab4ff2f8bdf22bed6ccd114c7101aecc8 (patch)
treec2c43474222742f11930a531147bc14888d1e806 /x11-libs/hippo-canvas
parentstable amd64, bug 315153 (diff)
downloadgentoo-2-7197b49ab4ff2f8bdf22bed6ccd114c7101aecc8.tar.gz
gentoo-2-7197b49ab4ff2f8bdf22bed6ccd114c7101aecc8.tar.bz2
gentoo-2-7197b49ab4ff2f8bdf22bed6ccd114c7101aecc8.zip
Bug #316993.
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'x11-libs/hippo-canvas')
-rw-r--r--x11-libs/hippo-canvas/ChangeLog6
-rw-r--r--x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild13
2 files changed, 12 insertions, 7 deletions
diff --git a/x11-libs/hippo-canvas/ChangeLog b/x11-libs/hippo-canvas/ChangeLog
index ab6621efd286..40d6f6139e11 100644
--- a/x11-libs/hippo-canvas/ChangeLog
+++ b/x11-libs/hippo-canvas/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/hippo-canvas
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/ChangeLog,v 1.5 2010/05/22 13:45:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/ChangeLog,v 1.6 2010/05/23 21:13:45 elvanor Exp $
+
+ 23 May 2010; Jean-Noël Rivasseau <elvanor@gentoo.org>
+ hippo-canvas-0.3.0-r1.ebuild:
+ Improvements for #316993.
22 May 2010; Pacho Ramos <pacho@gentoo.org> hippo-canvas-0.3.0-r1.ebuild:
stable amd64, bug 292066
diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild
index 7818f403e71f..a991fa7a5b98 100644
--- a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild
@@ -1,12 +1,13 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild,v 1.4 2010/05/22 13:45:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild,v 1.5 2010/05/23 21:13:45 elvanor Exp $
EAPI="2"
GCONF_DEBUG="no"
G2PUNT_LA="yes"
-inherit eutils gnome2
+PYTHON_DEPEND="python? 2"
+inherit eutils gnome2 multilib python
DESCRIPTION="A canvas library based on GTK+-2, Cairo, and Pango"
HOMEPAGE="http://live.gnome.org/HippoCanvas"
@@ -22,8 +23,7 @@ RDEPEND=">=dev-libs/glib-2.6
>=x11-libs/gtk+-2.6
x11-libs/pango
gnome-base/librsvg
- python? ( dev-lang/python
- dev-python/pycairo
+ python? ( dev-python/pycairo
dev-python/pygtk )"
DEPEND="${RDEPEND}
dev-util/pkgconfig
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS README TODO"
pkg_setup() {
+ python_set_active_version 2
G2CONF="$(use_enable python)"
}
@@ -46,6 +47,6 @@ src_configure() {
src_install() {
gnome2_src_install
- rm "${D}/usr/lib/python2.6/site-packages/hippo.la"
- rm "${D}/usr/lib/libhippocanvas-1.la"
+ rm "${D}$(python_get_sitedir)/hippo.la"
+ rm "${D}/usr/$(get_libdir)/libhippocanvas-1.la"
}