Bump to 0.15.4. Close bug #61835 and bug #248536.

(Portage version: 2.2_rc15/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 113 insertions, 2 deletions

diff --git a/x11-libs/diacanvas/ChangeLog b/x11-libs/diacanvas/ChangeLog
index 36dbd4a8efb8..32ff116e2075 100644
--- a/x11-libs/diacanvas/ChangeLog
+++ b/x11-libs/diacanvas/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/diacanvas
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/diacanvas/ChangeLog,v 1.4 2007/02/21 23:54:30 jokey Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/diacanvas/ChangeLog,v 1.5 2008/11/24 13:25:36 eva Exp $
+
+*diacanvas-0.15.4 (24 Nov 2008)
+
+  24 Nov 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/diacanvas-0.15.4-python-bindings.patch, +diacanvas-0.15.4.ebuild:
+  Bump to 0.15.4. Close bug #61835 and bug #248536.
 
   21 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
   Redigest for Manifest2
diff --git a/x11-libs/diacanvas/diacanvas-0.15.4.ebuild b/x11-libs/diacanvas/diacanvas-0.15.4.ebuild
new file mode 100644
index 000000000000..d3c503042dd0
--- /dev/null
+++ b/x11-libs/diacanvas/diacanvas-0.15.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/diacanvas/diacanvas-0.15.4.ebuild,v 1.1 2008/11/24 13:25:36 eva Exp $
+
+inherit eutils gnome2
+
+MY_P=${PN}2_${PV}
+MY_P2=${PN}2-${PV}
+
+DESCRIPTION="Gnome library to draw diagrams"
+HOMEPAGE="http://diacanvas.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+IUSE="python gnome doc"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="LGPL-2.1"
+
+RDEPEND=">=dev-libs/glib-2
+	>=media-libs/libart_lgpl-2
+	>=gnome-base/libgnomecanvas-2
+	python? (
+		>=dev-lang/python-2.2
+		>=dev-python/pygtk-2 )
+	gnome? ( >=gnome-base/libgnomeprint-2.2 )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.7 )"
+
+DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"
+
+S="${WORKDIR}/${MY_P2}"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable gnome gnome-print)
+		$(use_enable python)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix functions overridden more than once
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1783924&group_id=21360&atid=371905
+	epatch "${FILESDIR}/${P}-python-bindings.patch"
+}
diff --git a/x11-libs/diacanvas/files/diacanvas-0.15.4-python-bindings.patch b/x11-libs/diacanvas/files/diacanvas-0.15.4-python-bindings.patch
new file mode 100644
index 000000000000..de91b64e26c8
--- /dev/null
+++ b/x11-libs/diacanvas/files/diacanvas-0.15.4-python-bindings.patch
@@ -0,0 +1,58 @@
+--- a/python/diacanvas.override	2008-11-24 14:05:47.000000000 +0100
++++ b/python/diacanvas.override	2008-11-24 14:07:35.000000000 +0100
+@@ -182,55 +182,6 @@
+ 	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT);
+ }
+ %%
+-override dia_canvas_item_new kwargs
+-static int
+-_wrap_dia_canvas_item_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ITEM);
+-}
+-%%
+-override dia_canvas_group_new kwargs
+-static int
+-_wrap_dia_canvas_group_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_GROUP);
+-}
+-%%
+-override dia_canvas_element_new kwargs
+-static int
+-_wrap_dia_canvas_element_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_ELEMENT);
+-}
+-%%
+-override dia_canvas_line_new kwargs
+-static int
+-_wrap_dia_canvas_line_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_LINE);
+-}
+-%%
+-override dia_canvas_box_new kwargs
+-static int
+-_wrap_dia_canvas_box_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_BOX);
+-}
+-%%
+-override dia_canvas_image_new kwargs
+-static int
+-_wrap_dia_canvas_image_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_IMAGE);
+-}
+-%%
+-override dia_canvas_text_new kwargs
+-static int
+-_wrap_dia_canvas_text_new (PyGObject *self, PyObject *args, PyObject *kwargs)
+-{
+-	return create_canvas_item (self, args, kwargs, DIA_TYPE_CANVAS_TEXT);
+-}
+-%%
+ override dia_canvas_get_pango_layout noargs
+ static PyObject *
+ _wrap_dia_canvas_get_pango_layout(PyGObject *self)