Fixed dependency, bug #248539.

(Portage version: 2.2_rc15/cvs/Linux 2.6.27-gentoo-r2 x86_64)

4 files changed, 81 insertions, 24 deletions

diff --git a/x11-libs/gtkmathview-bonobo/ChangeLog b/x11-libs/gtkmathview-bonobo/ChangeLog
index 8372fa65fb9c..0d826bcd08de 100644
--- a/x11-libs/gtkmathview-bonobo/ChangeLog
+++ b/x11-libs/gtkmathview-bonobo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtkmathview-bonobo
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview-bonobo/ChangeLog,v 1.7 2007/05/15 14:26:59 bangert Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview-bonobo/ChangeLog,v 1.8 2008/11/24 10:16:40 matsuu Exp $
+
+*gtkmathview-bonobo-0.0.4-r1 (24 Nov 2008)
+
+  24 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/gtkmathview-bonobo-0.0.4-gentoo.patch,
+  -gtkmathview-bonobo-0.0.2.ebuild, +gtkmathview-bonobo-0.0.4-r1.ebuild:
+  Fixed dependency, bug #248539.
 
   15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
   add <herd>no-herd</herd>
diff --git a/x11-libs/gtkmathview-bonobo/files/gtkmathview-bonobo-0.0.4-gentoo.patch b/x11-libs/gtkmathview-bonobo/files/gtkmathview-bonobo-0.0.4-gentoo.patch
new file mode 100644
index 000000000000..9474ddfd07cc
--- /dev/null
+++ b/x11-libs/gtkmathview-bonobo/files/gtkmathview-bonobo-0.0.4-gentoo.patch
@@ -0,0 +1,43 @@
+diff -Naur gtkmathview-bonobo-0.0.4.orig/src/aux.cc gtkmathview-bonobo-0.0.4/src/aux.cc
+--- gtkmathview-bonobo-0.0.4.orig/src/aux.cc	2003-10-05 16:44:09.000000000 +0900
++++ gtkmathview-bonobo-0.0.4/src/aux.cc	2008-11-24 19:04:15.000000000 +0900
+@@ -24,6 +24,7 @@
+ #include <config.h>
+ 
+ #include <cassert>
++#include <cstdlib>
+ 
+ #include <sstream>
+ 
+@@ -34,8 +35,6 @@
+ 
+ #include "aux.h"
+ 
+-#define MATHML_NS_URI "http://www.w3.org/1998/Math/MathML"
+-
+ namespace DOM = GdomeSmartDOM;
+ 
+ static DOM::Element
+diff -Naur gtkmathview-bonobo-0.0.4.orig/src/aux.h gtkmathview-bonobo-0.0.4/src/aux.h
+--- gtkmathview-bonobo-0.0.4.orig/src/aux.h	2003-09-14 00:17:10.000000000 +0900
++++ gtkmathview-bonobo-0.0.4/src/aux.h	2008-11-24 19:03:55.000000000 +0900
+@@ -26,6 +26,8 @@
+ 
+ #include <gdome.h>
+ 
++#define MATHML_NS_URI "http://www.w3.org/1998/Math/MathML"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+diff -Naur gtkmathview-bonobo-0.0.4.orig/src/control-factory.c gtkmathview-bonobo-0.0.4/src/control-factory.c
+--- gtkmathview-bonobo-0.0.4.orig/src/control-factory.c	2004-05-22 01:06:26.000000000 +0900
++++ gtkmathview-bonobo-0.0.4/src/control-factory.c	2008-11-24 19:04:39.000000000 +0900
+@@ -33,6 +33,7 @@
+ #include "persist-stream.h"
+ #include "handlers.h"
+ #include "view.h"
++#include "aux.h"
+ 
+ enum
+   {
diff --git a/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.2.ebuild b/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.2.ebuild
deleted file mode 100644
index b1afe08efc73..000000000000
--- a/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.2.ebuild,v 1.2 2004/06/24 22:02:33 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="Bonobo wrapper for GtkMathView"
-HOMEPAGE="http://helm.cs.unibo.it/gtkmathview-bonobo/"
-SRC_URI="http://helm.cs.unibo.it/gtkmathview-bonobo/sources/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtkmathview-0.5.1
-	>=gnome-base/libbonoboui-2.0"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
diff --git a/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.4-r1.ebuild b/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.4-r1.ebuild
new file mode 100644
index 000000000000..43b0c4d3a5ef
--- /dev/null
+++ b/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtkmathview-bonobo/gtkmathview-bonobo-0.0.4-r1.ebuild,v 1.1 2008/11/24 10:16:40 matsuu Exp $
+
+EAPI=2
+inherit eutils gnome2
+
+DESCRIPTION="Bonobo wrapper for GtkMathView"
+HOMEPAGE="http://helm.cs.unibo.it/gtkmathview-bonobo/"
+SRC_URI="http://helm.cs.unibo.it/gtkmathview-bonobo/sources/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtkmathview-0.6.2[gtk]
+	>=gnome-base/libbonobo-2
+	>=gnome-base/libbonoboui-2
+	>=gnome-base/libgnomeui-2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}