New release 0.52. Resolves bug #47347.

Package-Manager: portage-2.0.51.21-r1

5 files changed, 70 insertions, 2 deletions

diff --git a/dev-db/mergeant/ChangeLog b/dev-db/mergeant/ChangeLog
index 1b0603e7c5de..3b3ff359e65b 100644
--- a/dev-db/mergeant/ChangeLog
+++ b/dev-db/mergeant/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mergeant
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.8 2005/05/12 03:07:45 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.9 2005/05/12 18:36:21 leonardop Exp $
+
+*mergeant-0.52 (12 May 2005)
+
+  12 May 2005; Leonardo Boshell <leonardop@gentoo.org> mergeant-0.52.ebuild,
+  files/mergeant-0.52-include_fix.patch:
+  New release. Includes a patch to correct the location of a header file.
+  Added support for 'debug' and 'static' USE flags. Style corrections and
+  updated dependencies. Resolves bug #47347.
 
   11 May 2005; Leonardo Boshell <leonardop@gentoo.org> mergeant-0.12.1.ebuild:
   Stable on x86.
diff --git a/dev-db/mergeant/Manifest b/dev-db/mergeant/Manifest
index 9244d7777775..ffb8e7aed8e3 100644
--- a/dev-db/mergeant/Manifest
+++ b/dev-db/mergeant/Manifest
@@ -1,4 +1,7 @@
-MD5 b07be5f870bd0b3f73382b93f90d1be9 ChangeLog 968
+MD5 e762872660006d6bfc315299ccd329a8 ChangeLog 1310
+MD5 f2b5e6c06f88b108d411d99ac3702992 mergeant-0.52.ebuild 1100
 MD5 68010de90524a3c0c89f125bf317ab0b mergeant-0.12.1.ebuild 1225
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 b437e811d4baf6bbb7a25bc2ad380da4 files/digest-mergeant-0.52 67
+MD5 42ef5f7f3f40c6ee11cac4ab5c0cf7a1 files/mergeant-0.52-include_fix.patch 443
 MD5 40c851ac355e64c4e94e52bbeabf5a2d files/digest-mergeant-0.12.1 69
diff --git a/dev-db/mergeant/files/digest-mergeant-0.52 b/dev-db/mergeant/files/digest-mergeant-0.52
new file mode 100644
index 000000000000..ec41df93e476
--- /dev/null
+++ b/dev-db/mergeant/files/digest-mergeant-0.52
@@ -0,0 +1 @@
+MD5 e9f96b824e452e9b9406b4c11f005b95 mergeant-0.52.tar.bz2 2058623
diff --git a/dev-db/mergeant/files/mergeant-0.52-include_fix.patch b/dev-db/mergeant/files/mergeant-0.52-include_fix.patch
new file mode 100644
index 000000000000..b39ce1454d3d
--- /dev/null
+++ b/dev-db/mergeant/files/mergeant-0.52-include_fix.patch
@@ -0,0 +1,12 @@
+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/mergeant-0.52.ebuild b/dev-db/mergeant/mergeant-0.52.ebuild
new file mode 100644
index 000000000000..d48686df9b73
--- /dev/null
+++ b/dev-db/mergeant/mergeant-0.52.ebuild
@@ -0,0 +1,44 @@
+# 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
+}