Fixed dependency, bug #248539.

Package-Manager: portage-2.2_rc15/cvs/Linux 2.6.27-gentoo-r2 x86_64

5 files changed, 84 insertions, 27 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/Manifest b/x11-libs/gtkmathview-bonobo/Manifest
index 36e9a4ce25bb..cb2e2c93b886 100644
--- a/x11-libs/gtkmathview-bonobo/Manifest
+++ b/x11-libs/gtkmathview-bonobo/Manifest
@@ -1,6 +1,6 @@
-DIST gtkmathview-bonobo-0.0.2.tar.gz 313941 RMD160 6cf5d8a0b653f3f05416bcb627360c3cee6bc39e SHA1 9a3c4cf476b25918afd8f54a79cec2fe4885cf80 SHA256 ba9d93128b41eec26b8a5f03f24958d2ffe6204744aaeb77af997dce2bdc829c
+AUX gtkmathview-bonobo-0.0.4-gentoo.patch 1303 RMD160 f8a647abaeafae5e5e69ecf53323d159e0672aee SHA1 f78f5dabace24f1d5eb8fc4bbfc828f46df524dd SHA256 3de57259f14791279ce199b0f9c1fc9dcc62a30ce806feadfb99cf2b0c4dfb86
 DIST gtkmathview-bonobo-0.0.4.tar.gz 315844 RMD160 6e18982b84bd1d6a0999d84353a81533cbd01867 SHA1 01d1084637c19e5bac95861d0e400bd1022a94a7 SHA256 d29d749e11572f95ead5f128d79a9796494a4fbf5beff7404be03447363e2a69
-EBUILD gtkmathview-bonobo-0.0.2.ebuild 640 RMD160 3f9ab1f4a6eca9bdd51a6d57f2d861c7ac9bba73 SHA1 c5ce6f192e2c959b5f5c6aefd5538776f9234770 SHA256 925e6d5b74ec7edc597dfde385d74a1245ba06cc680c98e5957aaa7d1c45b80c
+EBUILD gtkmathview-bonobo-0.0.4-r1.ebuild 779 RMD160 28254741468383fcb7c5bcbc5a3c7fa51dbe54b1 SHA1 c45539995423751aa5b15afc0442916c2e147231 SHA256 0a2b21227f89e2bb821ddfa2d6dd5492f086ade21d3eb810c143fc7da77225e8
 EBUILD gtkmathview-bonobo-0.0.4.ebuild 701 RMD160 31e41f2ee9a47aa6f1b8fcbb9bd29633419694cf SHA1 bc46bcb0f5faf097f82164ea7b21bdd050173008 SHA256 8a2e893cab20bd35e00d064bb53d6c38d9d6ff2ac72657fb1693e5a6d3661f29
-MISC ChangeLog 942 RMD160 2ce557201c5bb82c6946f140d6e0a9e7158ef4d8 SHA1 d35ef4018c7f92d85f42fca8bcf70a0aeacea0c0 SHA256 e7454194edc2e89c24def929878b5ea4c9f81a64b764512a20881e362bccaccf
+MISC ChangeLog 1189 RMD160 d86067277cbf730dca0f872ee4ed004ed6fa77d1 SHA1 b2dfc004eda09946a49570bbb7ad31b82f8c54fe SHA256 b84360485548a85dd32010cc132605e5d3a2885e0ff7cfba54e98b1b58c56a59
 MISC metadata.xml 409 RMD160 74162fc0d9a2fe73c5ee3fd88bc25f76d1203c4f SHA1 339e7db5e458cabe4db339cd69ab729bed69aa42 SHA256 305e6970387b64549dfc9c1fb295c349fce96f4820ce87d01842a3cf4bed63dd
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"
+}