Updated to version 0.6_pre1, change X flag to gnome, Removed gtk dependency, fixed symlink on install all to address Bug 69633

(Portage version: 2.0.54-r2)

6 files changed, 98 insertions, 29 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index 552d5a851b58..29641fd3c569 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mdbtools
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.17 2006/02/18 23:00:25 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.18 2006/05/24 23:35:05 merlin Exp $
+
+  24 May 2006; Cory Visi <visi@gentoo.org> :
+  Updated to version 0.6_pre1, change X flag to gnome, Removed gtk dependency,
+  fixed symlink on install all to address Bug 69633
 
   18 Feb 2006; Aron Griffis <agriffis@gentoo.org> mdbtools-0.5.ebuild:
   Mark 0.5 stable on ia64
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 129262208e9d..a4abbf17f756 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,31 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5dab6ce318520b34d85d4bd07a6ad826 ChangeLog 1789
-RMD160 c6f07218f633d284561a2c8dca3fa49168d9d96f ChangeLog 1789
-SHA256 ad8081415b534e876e73654c1494da79533835abb1219e57da142205ca3af3e3 ChangeLog 1789
+MD5 262a57bbacafe94cd2d71a868b028e07 ChangeLog 1966
 MD5 48d861b456922a79e1c3ddf47137ced9 files/digest-mdbtools-0.4 64
-RMD160 6ccae3688da26b94d3204fe42bf6694b63ba5230 files/digest-mdbtools-0.4 64
-SHA256 77e8c7fff4b56818f3eb32038cc6d06bda303749f05ba7956b349ab786e0d47e files/digest-mdbtools-0.4 64
 MD5 402da6348fabe50879d699674f8239ea files/digest-mdbtools-0.5 64
-RMD160 72e60faf07e6729b4f59839e2ee931420876a4df files/digest-mdbtools-0.5 64
-SHA256 0b42964ea7703dbd2d6e95706841fe59c42e0571841b297baf467c6ee896043b files/digest-mdbtools-0.5 64
+MD5 c914c548d600b31e1df77d482ed39822 files/digest-mdbtools-0.6_pre1 68
 MD5 d056516aee83f6794540f87e15521059 files/mdbtools-0.4-termcap.diff 412
-RMD160 08ad7adbaca4fb3125dad8e1a9c4e93c4f505552 files/mdbtools-0.4-termcap.diff 412
-SHA256 19af39a4700e7efcd2710fbb0aa8a5ba959e621c3d72749e6df00d39f59d6124 files/mdbtools-0.4-termcap.diff 412
 MD5 96e88f8e3b0a2ffc9628083a8b924d71 files/mdbtools-0.5-gcc34.patch 1682
-RMD160 b8e28cafa5f891db2d084ebee0cc32634414e9b4 files/mdbtools-0.5-gcc34.patch 1682
-SHA256 3e78debfa1406801bfa9db920989b69acbc5dd3e653598acfe7f799bff720c9e files/mdbtools-0.5-gcc34.patch 1682
-MD5 656da105f920c8956b290d5b7769c170 mdbtools-0.4.ebuild 1486
-RMD160 79189de9a5cc1e7b19ead5f5161ed2bb1d8e527a mdbtools-0.4.ebuild 1486
-SHA256 271349722cdfb2e0aeb244601fe7def9a0d4f8a0087729d133eaa002a1e5c488 mdbtools-0.4.ebuild 1486
+MD5 7899f05ce1ebcdf1517ea62a21409da8 files/mdbtools-0.6_pre1-gcc34.patch 1571
+MD5 21943eb3dda524a7b534868818916ae3 mdbtools-0.4.ebuild 1486
 MD5 74e2feb6cc446de6d11236d50f0fed73 mdbtools-0.5.ebuild 1181
-RMD160 fdf993562baa95ec3f786fb91a5bde81b3c5b8f0 mdbtools-0.5.ebuild 1181
-SHA256 8398ed525831e99ac392d0a46401f6c9bc53851314231e0e9ac0ac83a6ee0947 mdbtools-0.5.ebuild 1181
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD96cSJrHF4yAQTrARArI5AKCCa2B6n1SSsnU76h//NKFt9j60egCgteXZ
-RrgNFRLIlkVn6XCM4SngKiA=
-=LaAV
------END PGP SIGNATURE-----
+MD5 c25e645a5e0d32f3ec9ac02a0a83a985 mdbtools-0.6_pre1.ebuild 1133
diff --git a/app-office/mdbtools/files/digest-mdbtools-0.6_pre1 b/app-office/mdbtools/files/digest-mdbtools-0.6_pre1
new file mode 100644
index 000000000000..39d150ab3f9f
--- /dev/null
+++ b/app-office/mdbtools/files/digest-mdbtools-0.6_pre1
@@ -0,0 +1 @@
+MD5 246e8f38b2a1af1bcff60ee0da59300b mdbtools-0.6pre1.tar.gz 611756
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc34.patch b/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc34.patch
new file mode 100644
index 000000000000..605273dd1116
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre1-gcc34.patch
@@ -0,0 +1,35 @@
+diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c mdbtools-0.6pre1/src/gmdb2/sql.c
+--- mdbtools-0.6pre1-orig/src/gmdb2/sql.c	2004-02-13 13:49:52.000000000 -0500
++++ mdbtools-0.6pre1/src/gmdb2/sql.c	2005-10-18 08:00:19.088362686 -0400
+@@ -38,6 +38,8 @@
+ 
+ void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
+ void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
++void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
++void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
+ 
+ void
+ gmdb_sql_close_all()
+diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/table_export.c mdbtools-0.6pre1/src/gmdb2/table_export.c
+--- mdbtools-0.6pre1-orig/src/gmdb2/table_export.c	2003-01-14 12:37:44.000000000 -0500
++++ mdbtools-0.6pre1/src/gmdb2/table_export.c	2005-10-18 08:00:19.089362678 -0400
+@@ -37,6 +37,8 @@
+ #define NEVER "Never"
+ #define AUTOMAT "Automatic (where necessary)"
+ 
++void gmdb_table_export_populate_dialog(GladeXML *xml);
++
+ void
+ gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, char *str)
+ {
+diff -Naur mdbtools-0.6pre1-orig/src/odbc/odbc.c mdbtools-0.6pre1/src/odbc/odbc.c
+--- mdbtools-0.6pre1-orig/src/odbc/odbc.c	2004-05-30 04:06:43.000000000 -0400
++++ mdbtools-0.6pre1/src/odbc/odbc.c	2005-10-18 08:00:19.090362669 -0400
+@@ -46,6 +46,7 @@
+ static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
+ static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
+ static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
++static void bind_columns(struct _hstmt *stmt);
+ 
+ static void bind_columns (struct _hstmt*);
+ 
diff --git a/app-office/mdbtools/mdbtools-0.4.ebuild b/app-office/mdbtools/mdbtools-0.4.ebuild
index fdc67fe66ce1..7f8bc00c1a68 100644
--- a/app-office/mdbtools/mdbtools-0.4.ebuild
+++ b/app-office/mdbtools/mdbtools-0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.4.ebuild,v 1.9 2005/01/01 15:37:10 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.4.ebuild,v 1.10 2006/05/24 23:35:05 merlin Exp $
 
 DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
 HOMEPAGE="http://sourceforge.net/projects/mdbtools/"
diff --git a/app-office/mdbtools/mdbtools-0.6_pre1.ebuild b/app-office/mdbtools/mdbtools-0.6_pre1.ebuild
new file mode 100644
index 000000000000..25e7f1b67c4f
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-0.6_pre1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre1.ebuild,v 1.1 2006/05/24 23:35:05 merlin Exp $
+
+inherit eutils
+
+MY_P=${P/_/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="http://sourceforge.net/projects/mdbtools/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+IUSE="gnome odbc"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=dev-libs/glib-2
+	sys-libs/ncurses
+	sys-libs/readline
+	>=sys-devel/flex-2.5.0
+	>=sys-devel/bison-1.35
+	gnome? ( >=gnome-base/libglade-2
+		>=gnome-base/libgnomeui-2 )
+	odbc? ( >=dev-db/unixODBC-2.0 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
+src_compile() {
+	local myconf
+	use odbc && myconf="${myconf} --with-unixodbc=/usr"
+
+	econf --enable-sql \
+		${myconf} || die "configure failed"
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc COPYING* NEWS README* TODO AUTHORS HACKING ChangeLog
+
+	# add a compat symlink (gmdb2 is not compiled if gnome USE flag is disabled)
+	use gnome && dosym gmdb2 /usr/bin/gmdb
+}