QA issues (#292066 and #299334).

Package-Manager: portage-2.1.7.17/cvs/Linux i686

5 files changed, 74 insertions, 4 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/Manifest b/x11-libs/hippo-canvas/Manifest
index 9d285d312ab6..7694f3f139d4 100644
--- a/x11-libs/hippo-canvas/Manifest
+++ b/x11-libs/hippo-canvas/Manifest
@@ -1,4 +1,6 @@
+AUX hippo-canvas-python-override.patch 349 RMD160 4ea0179de43e270fef27ec1d9b8ba701e17f8e08 SHA1 d8fa18a04b6b57402bc4a2e2d281781d97665f28 SHA256 6c251e142c0cb591e27c0637f3a521f62b5664c1d709021c74683fd3f4af241e
 DIST hippo-canvas-0.3.0.tar.bz2 376859 RMD160 05a3efbc568d900c43be97cf1d2f8759ad60cfc5 SHA1 840c8d1e45ee48a4804b80704d2639bf2eca9da1 SHA256 21d0f3f7eb1c448fd6eaec1979b1474011b541249edaaab6e1dfb772ac8eb514
-EBUILD hippo-canvas-0.3.0.ebuild 754 RMD160 84539e7f19a0f69856c70314d1ce7756c4aeec6d SHA1 d79b6327fa2721cd2c2376d68e3545608b5a01f9 SHA256 5f305be4e6aedd107c46fb61baa1a039c311ddc803ccce59f11dc6987daac7b8
-MISC ChangeLog 1661 RMD160 da03c78b79adcd4c79477b1b8a4f8ba5b70e6e10 SHA1 df80f88d9a8cff0758ccb00dc08d2f31d0716c60 SHA256 c04f3bfbea158755282dd98b33dac4ae671bf324e8fdd1b21f5f37b2afab8ec9
+EBUILD hippo-canvas-0.3.0-r1.ebuild 1038 RMD160 17ff3e2605525ce706bebeae4eb28d933f227977 SHA1 fb734fa461fdf0cdb8ba55bf1a8220acd8e9c3a9 SHA256 4e5337bc96c54d05db8066f04a6da08a0f62fd757569383be9506d0c2862d285
+EBUILD hippo-canvas-0.3.0.ebuild 767 RMD160 2729b62aae32dad7e4ef4d3a5b6bd81929bfdb4a SHA1 9d8be4890be630853900b16a45b7ba5ecc5bfdc8 SHA256 d1d007cdd87e2623e76c827f94e37baf3c1198b1f4d9102a0f7c0bb288115a1b
+MISC ChangeLog 1906 RMD160 1b3aa726d8f97fdfa2dea7cbf443c850a58a39cb SHA1 0c632c833c349a06491e868e804e421d2e5ac19f SHA256 5adedf8375587c6f4ee8e8821a7b2ae07e1f3f0cf4b8a05d8fdaec1ab266d326
 MISC metadata.xml 582 RMD160 041367dafab41c91be554984562771e01721ed85 SHA1 57407cd0157ae4a8994db0dbe4d9f9ac4421edee SHA256 0b517ba8113dbc4234f7aeff73785289f731ad60d8a3b1ab4d5642d7a9700095
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"