QA issues (#292066 and #299334).

(Portage version: 2.1.7.17/cvs/Linux i686)

4 files changed, 70 insertions, 2 deletions

diff --git a/x11-libs/hippo-canvas/ChangeLog b/x11-libs/hippo-canvas/ChangeLog
index f787db1f8bf9..6daa4f9e327a 100644
--- a/x11-libs/hippo-canvas/ChangeLog
+++ b/x11-libs/hippo-canvas/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2010/03/02 10:20:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/ChangeLog,v 1.3 2010/04/13 20:42:52 elvanor Exp $
+
+*hippo-canvas-0.3.0-r1 (13 Apr 2010)
+
+  13 Apr 2010; Jean-Noël Rivasseau <elvanor@gentoo.org>
+  hippo-canvas-0.3.0.ebuild, +hippo-canvas-0.3.0-r1.ebuild,
+  +files/hippo-canvas-python-override.patch:
+  Fix for #299334 as well QA issues (#292066).
 
   02 Mar 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   hippo-canvas-0.3.0.ebuild:
diff --git a/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch b/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
new file mode 100644
index 000000000000..bcbae474160b
--- /dev/null
+++ b/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
@@ -0,0 +1,10 @@
+--- hippo.override	2008-05-21 16:22:02.000000000 -0700
++++ hippo.override-new	2010-04-13 13:11:20.826177339 -0700
+@@ -19,6 +19,7 @@
+ #include "hippo/hippo-canvas-widget.h"
+ #include "hippo/hippo-canvas-window.h"
+ #include "hippo/hippo-canvas-widgets.h"
++#include "common/hippo/hippo-canvas-test.h"
+ 
+ #include "hippo/hippo-canvas-type-builtins.h"
+ 
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
new file mode 100644
index 000000000000..18df66a6daaf
--- /dev/null
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r1.ebuild
@@ -0,0 +1,50 @@
+# 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.1 2010/04/13 20:42:52 elvanor Exp $
+
+EAPI="2"
+
+GCONF_DEBUG="no"
+G2PUNT_LA="yes"
+inherit eutils gnome2
+
+DESCRIPTION="A canvas library based on GTK+-2, Cairo, and Pango"
+HOMEPAGE="http://live.gnome.org/HippoCanvas"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc python"
+
+RDEPEND=">=dev-libs/glib-2.6
+	dev-libs/libcroco
+	>=x11-libs/gtk+-2.6
+	x11-libs/pango
+	python? ( dev-lang/python
+		dev-python/pycairo
+		dev-python/pygtk )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( dev-util/gtk-doc )"
+
+DOCS="AUTHORS README TODO"
+
+pkg_setup() {
+	G2CONF="$(use_enable python)"
+}
+
+src_prepare() {
+	cd "$S/python"
+	epatch "${FILESDIR}/${PN}-python-override.patch"
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	gnome2_src_install
+	rm "${D}/usr/lib/python2.6/site-packages/hippo.la"
+	rm "${D}/usr/lib/libhippocanvas-1.la"
+}
diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0.ebuild
index 8742c7bcc764..5f97ffc9de20 100644
--- a/x11-libs/hippo-canvas/hippo-canvas-0.3.0.ebuild
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0.ebuild
@@ -1,10 +1,11 @@
 # 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.ebuild,v 1.2 2010/03/02 10:20:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/hippo-canvas/hippo-canvas-0.3.0.ebuild,v 1.3 2010/04/13 20:42:52 elvanor Exp $
 
 EAPI="2"
 
 GCONF_DEBUG="no"
+G2PUNT_LA="yes"
 inherit gnome2
 
 DESCRIPTION="A canvas library based on GTK+-2, Cairo, and Pango"