New release: 0.65

Package-Manager: portage-2.1.2-r3

10 files changed, 216 insertions, 118 deletions

diff --git a/dev-db/mergeant/ChangeLog b/dev-db/mergeant/ChangeLog
index 3c3a47b984a9..288b7c7aff2c 100644
--- a/dev-db/mergeant/ChangeLog
+++ b/dev-db/mergeant/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mergeant
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.10 2006/02/24 17:55:45 allanonjl Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.11 2007/01/29 22:58:09 leonardop Exp $
+
+*mergeant-0.65 (29 Jan 2007)
+
+  29 Jan 2007; Leonardo Boshell <leonardop@gentoo.org>
+  -files/mergeant-0.52-include_fix.patch,
+  +files/mergeant-0.65-api_updates.patch, -mergeant-0.12.1.ebuild,
+  -mergeant-0.52.ebuild, +mergeant-0.65.ebuild:
+  New release for testing along with the 3.0 beta libraries. Updated
+  dependencies.
 
   24 Feb 2006; John N. Laliberte <allanonjl@gentoo.org> metadata.xml:
   change maintainer to leonardop.
diff --git a/dev-db/mergeant/Manifest b/dev-db/mergeant/Manifest
index ab7d8e0cdf67..38e030f42134 100644
--- a/dev-db/mergeant/Manifest
+++ b/dev-db/mergeant/Manifest
@@ -1,21 +1,20 @@
-MD5 1185061d5150d0356a61053c444f6eb7 ChangeLog 1416
-RMD160 74c9f8817847a8c5df66f27d2767e2a8e1c36a77 ChangeLog 1416
-SHA256 60aab6be1796e94235df1c765b65fed35b14702fd6fc0639353a434269c68efc ChangeLog 1416
-MD5 40c851ac355e64c4e94e52bbeabf5a2d files/digest-mergeant-0.12.1 69
-RMD160 5088efb0df5e5247df698e714f88d60e3fc22db7 files/digest-mergeant-0.12.1 69
-SHA256 afc321513848c5a6d8120b05c5d708a4291a615f6baf1d8c5cbc08b02d1bfdd7 files/digest-mergeant-0.12.1 69
-MD5 b437e811d4baf6bbb7a25bc2ad380da4 files/digest-mergeant-0.52 67
-RMD160 6cb8418f1279f73c62174bce289845b301f1be3f files/digest-mergeant-0.52 67
-SHA256 dfcb9c5d7f977e8e8cddf5e525b4af183cc4ab490a7a77bb7a1450688441faa7 files/digest-mergeant-0.52 67
-MD5 42ef5f7f3f40c6ee11cac4ab5c0cf7a1 files/mergeant-0.52-include_fix.patch 443
-RMD160 cb611fd0750b299f83e82d67cbb699e0e311c86f files/mergeant-0.52-include_fix.patch 443
-SHA256 ce70d62f81b6a835da600664af29270bb69a20340fa748264ef5c868a33c6d78 files/mergeant-0.52-include_fix.patch 443
-MD5 68010de90524a3c0c89f125bf317ab0b mergeant-0.12.1.ebuild 1225
-RMD160 4318b002b5b6c4a338a61ed1e4fe6620c0163f5e mergeant-0.12.1.ebuild 1225
-SHA256 5456449ab83ebb026c289e6e60a20eeb20ed892bc90fdf58e5f600d21abd48f7 mergeant-0.12.1.ebuild 1225
-MD5 f2b5e6c06f88b108d411d99ac3702992 mergeant-0.52.ebuild 1100
-RMD160 d077c762bb8c9320440174abff4d3bc37e5463c6 mergeant-0.52.ebuild 1100
-SHA256 e29282e9cf71bc6e49a61dce2173c05901f44d6c385639cf317a834c051b939b mergeant-0.52.ebuild 1100
+AUX mergeant-0.65-api_updates.patch 6391 RMD160 9b615f84d615d5ed4322534302ebc6618c9f787f SHA1 10f18eb15ece27afafe524e6c436a4b049e1b8c5 SHA256 9081d64069d76dfa77899c68d98ef729ca48933cc93a879a3d7aed0c92215139
+MD5 7276dc09c16cd2834b2e34a326503d01 files/mergeant-0.65-api_updates.patch 6391
+RMD160 9b615f84d615d5ed4322534302ebc6618c9f787f files/mergeant-0.65-api_updates.patch 6391
+SHA256 9081d64069d76dfa77899c68d98ef729ca48933cc93a879a3d7aed0c92215139 files/mergeant-0.65-api_updates.patch 6391
+DIST mergeant-0.65.tar.bz2 986229 RMD160 c0acc4415b3ad0a98a88907791289fdcf79e03c3 SHA1 7081de474d687ff9a7b3bbe5ddb8b05ca67256f4 SHA256 340a6d77b58f9f03079fbd6ff7298b22fb8b218a06e863fb1005844aa8f4eee0
+EBUILD mergeant-0.65.ebuild 1047 RMD160 b6461ae09a6beb0a5de90c41859c592ca4b85836 SHA1 ea91c8841f561b96e0881e3140bb2884463fd9b2 SHA256 204782f8f16c4c2be30511465afda992b49ccf189b0ee2016fadce49393d4596
+MD5 1017ff2771a5459ce9380db077e9aac8 mergeant-0.65.ebuild 1047
+RMD160 b6461ae09a6beb0a5de90c41859c592ca4b85836 mergeant-0.65.ebuild 1047
+SHA256 204782f8f16c4c2be30511465afda992b49ccf189b0ee2016fadce49393d4596 mergeant-0.65.ebuild 1047
+MISC ChangeLog 1744 RMD160 8bf8f1ba161248bbe5f911c89ae004c3f61d6a49 SHA1 5a4dc290e2393df8efad22dd9e7c0b5d56d5e4a3 SHA256 bb09971221fb355dd38497730b96cb4917561872f707b53abb70c96925d50948
+MD5 76d188532f9e00c282b2b9271c453a6a ChangeLog 1744
+RMD160 8bf8f1ba161248bbe5f911c89ae004c3f61d6a49 ChangeLog 1744
+SHA256 bb09971221fb355dd38497730b96cb4917561872f707b53abb70c96925d50948 ChangeLog 1744
+MISC metadata.xml 223 RMD160 b838a1b78a7909ef0d6b335da68d2cc5634c8780 SHA1 8f61ac9df493a913ac92dcbfd3cc2d90966a559d SHA256 051b289f968f9d1c388270c2798a17bdd6b02db8b69c8628e52dd6fea97c0e15
 MD5 1351f9a4a772bff3c6917bd5fc18ddb0 metadata.xml 223
 RMD160 b838a1b78a7909ef0d6b335da68d2cc5634c8780 metadata.xml 223
 SHA256 051b289f968f9d1c388270c2798a17bdd6b02db8b69c8628e52dd6fea97c0e15 metadata.xml 223
+MD5 89f32e84b49b5e585324e7fc76c1180f files/digest-mergeant-0.65 244
+RMD160 f1194dcb02600c0818e83147d0946909092b328e files/digest-mergeant-0.65 244
+SHA256 7d15244cae5e3cf349df8319a0c91019d031a4fc1a0867e589c8108b0ce32bfd files/digest-mergeant-0.65 244
diff --git a/dev-db/mergeant/files/digest-mergeant-0.12.1 b/dev-db/mergeant/files/digest-mergeant-0.12.1
deleted file mode 100644
index dee092481cb3..000000000000
--- a/dev-db/mergeant/files/digest-mergeant-0.12.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42a2f6778b81409db6cd1baa49663dca mergeant-0.12.1.tar.bz2 1204581
diff --git a/dev-db/mergeant/files/digest-mergeant-0.52 b/dev-db/mergeant/files/digest-mergeant-0.52
deleted file mode 100644
index ec41df93e476..000000000000
--- a/dev-db/mergeant/files/digest-mergeant-0.52
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9f96b824e452e9b9406b4c11f005b95 mergeant-0.52.tar.bz2 2058623
diff --git a/dev-db/mergeant/files/digest-mergeant-0.65 b/dev-db/mergeant/files/digest-mergeant-0.65
new file mode 100644
index 000000000000..5d3c0bb8823c
--- /dev/null
+++ b/dev-db/mergeant/files/digest-mergeant-0.65
@@ -0,0 +1,3 @@
+MD5 2c6e677e58ee02ef428ea55bbbcd5d32 mergeant-0.65.tar.bz2 986229
+RMD160 c0acc4415b3ad0a98a88907791289fdcf79e03c3 mergeant-0.65.tar.bz2 986229
+SHA256 340a6d77b58f9f03079fbd6ff7298b22fb8b218a06e863fb1005844aa8f4eee0 mergeant-0.65.tar.bz2 986229
diff --git a/dev-db/mergeant/files/mergeant-0.52-include_fix.patch b/dev-db/mergeant/files/mergeant-0.52-include_fix.patch
deleted file mode 100644
index b39ce1454d3d..000000000000
--- a/dev-db/mergeant/files/mergeant-0.52-include_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -NurdB mergeant-0.52/libmergeant/mg-query.c mergeant-0.52-sql-header/libmergeant/mg-query.c
---- mergeant-0.52/libmergeant/mg-query.c	2004-08-08 10:20:06.000000000 -0500
-+++ mergeant-0.52-sql-header/libmergeant/mg-query.c	2005-05-12 12:11:53.000000000 -0500
-@@ -44,7 +44,7 @@
- #include "mg-server-aggregate.h"
- #include "mg-data-handler.h"
- 
--#include <libgda/sql/sql_parser.h>
-+#include <sql/sql_parser.h>
- #include "mg-qf-func.h"
- 
- /* 
diff --git a/dev-db/mergeant/files/mergeant-0.65-api_updates.patch b/dev-db/mergeant/files/mergeant-0.65-api_updates.patch
new file mode 100644
index 000000000000..43fbc365667d
--- /dev/null
+++ b/dev-db/mergeant/files/mergeant-0.65-api_updates.patch
@@ -0,0 +1,139 @@
+diff -NurdpB mergeant-0.65/configure.in mergeant-0.65-patched/configure.in
+--- mergeant-0.65/configure.in	2006-12-22 14:57:36.000000000 -0500
++++ mergeant-0.65-patched/configure.in	2007-01-29 16:47:26.000000000 -0500
+@@ -80,6 +80,7 @@ ALL_LINGUAS="am ar az ca cs da de el en_
+ AM_GLIB_GNU_GETTEXT
+ 
+ PKG_CHECK_MODULES(MERGEANT, libgnomedb-3.0 >= 2.99.2 \
++	libgnomedb-graph-3.0 \
+         libgda-3.0 >= 2.99.2 \
+ 	gconf-2.0 \
+         gtk+-2.0 >= 2.6.0 \
+diff -NurdpB mergeant-0.65/src/query-druid.c mergeant-0.65-patched/src/query-druid.c
+--- mergeant-0.65/src/query-druid.c	2006-10-27 10:02:09.000000000 -0500
++++ mergeant-0.65-patched/src/query-druid.c	2007-01-29 16:55:56.000000000 -0500
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include "query-druid.h"
++#include <libgnomedb-graph/libgnomedb-graph.h>
+ #include <libgnomedb/libgnomedb.h>
+ #include <libgda/libgda.h>
+ #include "workspace-page.h"
+diff -NurdpB mergeant-0.65/src/query-editor.c mergeant-0.65-patched/src/query-editor.c
+--- mergeant-0.65/src/query-editor.c	2006-12-22 05:06:35.000000000 -0500
++++ mergeant-0.65-patched/src/query-editor.c	2007-01-29 16:54:56.000000000 -0500
+@@ -22,6 +22,7 @@
+ #include "query-fields-editor.h"
+ #include "query-params-editor.h"
+ #include <libgnomedb/gnome-db-editor.h>
++#include <libgnomedb-graph/libgnomedb-graph.h>
+ 
+ static void query_editor_class_init (QueryEditorClass * class);
+ static void query_editor_init (QueryEditor * wid);
+@@ -488,8 +489,8 @@ query_changed_cb (GdaQuery *query, Query
+ 		gtk_entry_set_text (GTK_ENTRY (qedit->priv->q_descr), "");
+ 
+ 	/* SQL version */
+-	sql = gda_renderer_render_as_sql (GDA_RENDERER (qedit->priv->query), NULL, 
+-					 GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_EXTRA_VAL_ATTRS, NULL);
++	sql = gda_renderer_render_as_sql (GDA_RENDERER (qedit->priv->query), NULL, NULL,
++					 GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_PARAMS_AS_DETAILED, NULL);
+ 	if (sql) {
+ 		gnome_db_editor_set_text (GNOME_DB_EDITOR (qedit->priv->sql_editor), sql, -1);
+ 		g_free (sql);
+@@ -503,8 +504,8 @@ query_changed_cb (GdaQuery *query, Query
+ 		sql = NULL;
+ 
+ 		if (cond) 
+-			sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL, 
+-							 GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_EXTRA_VAL_ATTRS, NULL);
++			sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL, NULL,
++							 GDA_RENDERER_EXTRA_PRETTY_SQL | GDA_RENDERER_PARAMS_AS_DETAILED, NULL);
+ 		if (sql) {
+ 			gnome_db_editor_set_text (GNOME_DB_EDITOR (qedit->priv->select_where), sql, -1);
+ 			g_free (sql);
+diff -NurdpB mergeant-0.65/src/query-fields-editor.c mergeant-0.65-patched/src/query-fields-editor.c
+--- mergeant-0.65/src/query-fields-editor.c	2006-10-27 10:02:09.000000000 -0500
++++ mergeant-0.65-patched/src/query-fields-editor.c	2007-01-29 16:39:33.000000000 -0500
+@@ -476,7 +476,7 @@ renderer_field_filter_edited_cb (GtkCell
+ 		newcond = gda_query_condition_new_from_sql (fedit->priv->query, new_text, NULL, &error);
+ 		if (!newcond) {
+ 			gchar *sql;
+-			sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, 0, NULL);
++			sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, NULL, 0, NULL);
+ 			if (sql) {
+ 				gchar *text = g_strdup_printf ("%s %s", sql, new_text);
+ 				g_free (sql);
+@@ -700,7 +700,7 @@ query_changed_cb (GdaQuery *query, Query
+ 		}
+ 		
+ 		/* modify the model at iter */
+-		sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, 0, NULL);
++		sql = gda_renderer_render_as_sql (GDA_RENDERER (field), NULL, NULL, 0, NULL);
+ 		order = gda_query_get_order_by_field (fedit->priv->query, field, &asc);
+ 		if (order >= 0) {
+ 			order_str = g_strdup_printf ("%d", order + 1);
+@@ -709,8 +709,8 @@ query_changed_cb (GdaQuery *query, Query
+ 		cond = g_object_get_data (G_OBJECT (field), "qf_filter_cond");
+ 		g_object_set_data (G_OBJECT (field), "qf_filter_cond", NULL);
+ 		if (cond) 
+-			cond_sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL, 
+-								    GDA_RENDERER_EXTRA_VAL_ATTRS,
++			cond_sql = gda_renderer_render_as_sql (GDA_RENDERER (cond), NULL, NULL,
++								    GDA_RENDERER_PARAMS_AS_DETAILED,
+ 								    NULL);
+ 		gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+ 				    COLUMN_FIELD_PTR, field,
+diff -NurdpB mergeant-0.65/src/ws-dbrels.c mergeant-0.65-patched/src/ws-dbrels.c
+--- mergeant-0.65/src/ws-dbrels.c	2006-10-27 10:02:10.000000000 -0500
++++ mergeant-0.65-patched/src/ws-dbrels.c	2007-01-29 16:45:50.000000000 -0500
+@@ -23,7 +23,6 @@
+ #include <string.h>
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+-#include <libgnomedb/libgnomedb.h>
+ #include <glib/gi18n-lib.h>
+ 
+ /* 
+diff -NurdpB mergeant-0.65/src/ws-dbrels.h mergeant-0.65-patched/src/ws-dbrels.h
+--- mergeant-0.65/src/ws-dbrels.h	2006-10-27 10:02:10.000000000 -0500
++++ mergeant-0.65-patched/src/ws-dbrels.h	2007-01-29 16:46:05.000000000 -0500
+@@ -24,6 +24,7 @@
+ 
+ #include <libgda/libgda.h>
+ #include <libgnomedb/libgnomedb.h>
++#include <libgnomedb-graph/libgnomedb-graph.h>
+ 
+ 
+ G_BEGIN_DECLS
+diff -NurdpB mergeant-0.65/src/ws-queries.c mergeant-0.65-patched/src/ws-queries.c
+--- mergeant-0.65/src/ws-queries.c	2006-10-27 10:02:10.000000000 -0500
++++ mergeant-0.65-patched/src/ws-queries.c	2007-01-29 16:18:51.000000000 -0500
+@@ -613,7 +613,7 @@ utility_query_execute_modif (GdaQuery *q
+ 	while (parent_window && !GTK_IS_WINDOW (parent_window)) 
+ 		parent_window = gtk_widget_get_parent (parent_window);
+ 
+-	sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context, 0, &error);
++	sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context, NULL, 0, &error);
+ 	qtype = gda_query_get_query_type (query);
+ 
+ 	switch (qtype) {
+@@ -843,7 +843,7 @@ action_query_exec_cb (GtkAction *action,
+ 				gchar *msg;
+ 				const gchar *sql;
+ 				
+-				sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context, 
++				sql = gda_renderer_render_as_sql (GDA_RENDERER (query), context, NULL,
+ 								  GDA_RENDERER_EXTRA_PRETTY_SQL, NULL);
+ 				query_exec_instance_free (qei);
+ 				msg = g_strdup_printf (_("<b><big>Execute the following query ?</big></b>\n"
+@@ -957,7 +957,7 @@ query_info_display_update (GdaQuery *que
+ 	if (query) {
+ 		gchar *sql;
+ 		GError *error = NULL;
+-		sql = gda_renderer_render_as_sql (GDA_RENDERER (query), NULL,
++		sql = gda_renderer_render_as_sql (GDA_RENDERER (query), NULL, NULL,
+ 						  GDA_RENDERER_EXTRA_PRETTY_SQL, &error);
+ 		if (sql) {
+ 			gnome_db_editor_set_text (GNOME_DB_EDITOR (ws->priv->sql_editor), sql, -1);
diff --git a/dev-db/mergeant/mergeant-0.12.1.ebuild b/dev-db/mergeant/mergeant-0.12.1.ebuild
deleted file mode 100644
index ae2eef6c3b9e..000000000000
--- a/dev-db/mergeant/mergeant-0.12.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.12.1.ebuild,v 1.5 2005/05/12 03:07:45 leonardop Exp $
-
-IUSE=""
-
-inherit gnome2 gnome.org
-
-DESCRIPTION="Database admin tool using libgnomedb and libgda"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86"
-
-RDEPEND=">=gnome-extra/libgnomedb-0.12.0
-	>=gnome-extra/libgda-0.12.0
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/libbonoboui-2.0
-	>=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.0
-	>=dev-libs/libxml2-2.5
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libglade-2.0"
-
-DEPEND=">=dev-util/pkgconfig-0.8
-	>=dev-util/intltool-0.22
-	app-text/scrollkeeper
-	${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix ${S}/doc/Makefile.in
-}
-
-src_install() {
-	# redefined libdir so plugins don't get installed in /usr/lib
-	gnome2_src_install "libdir=${D}/usr/share/mergeant/plugins" "dtddir=${D}/usr/share/mergeant/dtd/" "Mergeant_Lang_helpdir=${D}/usr/share/doc/mergeant/C" "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/" "Pixmapdir=${D}/usr/share/pixmaps/mergeant"
-}
diff --git a/dev-db/mergeant/mergeant-0.52.ebuild b/dev-db/mergeant/mergeant-0.52.ebuild
deleted file mode 100644
index d48686df9b73..000000000000
--- a/dev-db/mergeant/mergeant-0.52.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.52.ebuild,v 1.1 2005/05/12 18:36:21 leonardop Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="Front-end for database administrators and developers"
-HOMEPAGE="http://www.gnome-db.org/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-IUSE="debug doc static"
-
-RDEPEND=">=gnome-extra/libgnomedb-1.1.3
-	>=gnome-extra/libgda-1.1.3
-	>=gnome-base/libbonoboui-2
-	>=gnome-base/gconf-2
-	>=x11-libs/gtk+-2.4
-	dev-libs/libxml2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnomeprint-2.2
-	>=gnome-base/libgnomeprintui-2.2
-	>=gnome-base/libglade-2"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.11
-	app-text/scrollkeeper
-	doc? ( dev-util/gtk-doc )"
-
-DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
-
-G2CONF="${G2CONF} $(use_enable debug debug-signal) $(use_enable static)"
-USE_DESTDIR="1"
-
-src_unpack() {
-	unpack ${A}
-	gnome2_omf_fix ${S}/doc/Makefile.in
-
-	cd ${S}
-	# Fix location of a header file
-	epatch ${FILESDIR}/${P}-include_fix.patch
-}
diff --git a/dev-db/mergeant/mergeant-0.65.ebuild b/dev-db/mergeant/mergeant-0.65.ebuild
new file mode 100644
index 000000000000..64d09965035f
--- /dev/null
+++ b/dev-db/mergeant/mergeant-0.65.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.65.ebuild,v 1.1 2007/01/29 22:58:09 leonardop Exp $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Front-end for database administrators and developers"
+HOMEPAGE="http://www.gnome-db.org/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+IUSE="debug doc"
+
+RDEPEND=">=gnome-extra/libgnomedb-2.99.2
+	>=gnome-extra/libgda-2.99.2
+	>=gnome-base/gconf-2
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/libxml2-2
+	>=gnome-base/libgnomeui-2
+	>=gnome-base/libglade-2"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.28
+	app-text/scrollkeeper
+	doc? ( dev-util/gtk-doc )"
+
+DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README TODO"
+
+
+pkg_setup() {
+	G2CONF="$(use_enable debug debug-signal)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Updates to fix compilation problems due to recent API changes
+	epatch "${FILESDIR}/${P}-api_updates.patch"
+
+	eautoreconf
+}