Version bump to lastest CVS version

5 files changed, 127 insertions, 11 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index 48edcc5e6036..ac797c617c58 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for app-office/mdbtools
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.41 2008/12/30 09:29:57 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.42 2009/01/01 10:22:07 graaff Exp $
+
+*mdbtools-0.6_pre2 (30 Dec 2008)
+
+  30 Dec 2008; Hans de Graaff <graaff@gentoo.org>
+  +files/mdbtools-0.6_pre2-as-needed.patch,
+  +files/mdbtools-0.6_pre2-gcc34.patch, +mdbtools-0.6_pre2.ebuild:
+  Add current CVS from 2005-06-24 as mdbtools-0.6_pre2. Since we were already on
+  pre1 there was not much room to create a better and increased version number.
+  Use a gentoo-hosted tarball with a copy from the CVS archive so that we have a
+  consistent archive to work with. Drop patches that got applied to upstream
+  CVS.
 
   30 Dec 2008; Hans de Graaff <graaff@gentoo.org>
   mdbtools-0.6_pre1-r1.ebuild:
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index c24e93aa255d..9fae0b6cc113 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,18 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mdbtools-0.6_pre1-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
 AUX mdbtools-0.6_pre1-gcc34.patch 1571 RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e SHA1 04e16d502c28cb065d04fc4afe68761380cd8521 SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633
 AUX mdbtools-0.6_pre1-gcc41.patch 498 RMD160 3c4c39b3c17066c09e7e3a5fa052d195eb3f6740 SHA1 b137104183f56f2a155a83036613c25b3deef15e SHA256 58ab3afcf6e3a97570db7980cf81792b21c84e9074afdc7826c2789306122a63
 AUX mdbtools-0.6_pre1-strlen.patch 284 RMD160 cfa88cda151cfb7f63cc7fbd3cb366d00f40ac35 SHA1 98ec5927166a47bda8a3223998282ff9b7fa3359 SHA256 a1ba4bde512318dc6db254f5ab04df94644970106fc950e316877734502f40b5
+AUX mdbtools-0.6_pre2-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
+AUX mdbtools-0.6_pre2-gcc34.patch 1468 RMD160 fc1ba2a523bf9dd4c0dd0601d70db4e5374ec1b2 SHA1 ae4dc5100d6fc097cddb93164cad360640da6405 SHA256 ae0f0ea67b9bcc8851073acba54297268f00a31a0d286b59680f7a28f15ba108
 DIST mdbtools-0.6pre1.tar.gz 611756 RMD160 e6a89d6984ba84aa9895ab0b6e6b68ac86881be3 SHA1 37a50d623a444ec690d2677b12b59c2f11e497c0 SHA256 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3
+DIST mdbtools-cvs-20050624.tar.gz 306961 RMD160 800328d9acc763ce58211b5a37ad20b8ce34cc21 SHA1 15c97da82826935032aa2089d3e9ed7e2931ce43 SHA256 471034a00f9441e34b3a236ce07bdb766fea0bd140fc69a3d8a9c7225bf573b3
 EBUILD mdbtools-0.6_pre1-r1.ebuild 1881 RMD160 1dab3e8bb357913103e6493535368dce195e2fa3 SHA1 5e83ffc7162230642668472ef93404a8a4f4ee89 SHA256 9b4246179a80d36e3e3db927500d4cf9c06df423a9c1bc9b95450049d741fcd5
+EBUILD mdbtools-0.6_pre2.ebuild 1821 RMD160 7afa7b25531f9dfd9c95a5c20a14b9e3a6bd2e7f SHA1 1a850e7f7071e76fbd8422426ceb37e4242422d2 SHA256 71a599772ec353751d5c01517263e78b253fe1e209e827661a79688cc789e3bd
 MISC ChangeLog 5105 RMD160 25319e80faa8dacd36161d8460df1da334e157a4 SHA1 97fc4b21f06847145f891e86f03fde2c673ab084 SHA256 9983ad0ef4e78ba466e0f9b32d909999c80645379b8a0b63b443805b0ccd4bd0
 MISC metadata.xml 220 RMD160 65cff73eb25c0cc60095d42dd59adbefcb127b77 SHA1 059c076f5c2d3a1eb0b022ef90920bcabaf841b3 SHA256 0f420960bb0e6e212e563ce0883b0e412304dfd506a39e434d2c7a40a603ba86
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklZ6iIACgkQqj4ysMWt/vs0hwCgmcgNeDA3GvYKR3KTsbn0jeC1
-LQ8An03JZYEpLr1vMkPrFi8Lv43migAa
-=zdxd
------END PGP SIGNATURE-----
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-as-needed.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-as-needed.patch
new file mode 100644
index 000000000000..fc424b6d62da
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre2-as-needed.patch
@@ -0,0 +1,11 @@
+--- src/odbc/Makefile.am.orig	2006-07-26 14:05:55.000000000 +0200
++++ src/odbc/Makefile.am	2006-07-26 14:06:02.000000000 +0200
+@@ -15,7 +15,7 @@
+ 				$(patsubst %.c, %.lo, $(SQLSOURCES))) \
+ 				$(patsubst %, $(MDBDIR)/%, \
+ 				$(patsubst %.c, %.lo, $(MDBSOURCES)))
+-LIBS	=	@LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
++LIBS	=	@LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
+ unittest_LDADD	=	libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
+ 
+ ## Need blank statement to avoid compiling odbc.c
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-gcc34.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-gcc34.patch
new file mode 100644
index 000000000000..9adf31caa191
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre2-gcc34.patch
@@ -0,0 +1,35 @@
+diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c mdbtools-0.6pre1/src/gmdb2/sql.c
+--- src/gmdb2/sql.c	2004-02-13 13:49:52.000000000 -0500
++++ src/gmdb2/sql.c	2005-10-18 08:00:19.088362686 -0400
+@@ -38,6 +38,8 @@
+ 
+ static void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
+ static 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
+--- src/gmdb2/table_export.c	2003-01-14 12:37:44.000000000 -0500
++++ 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
+--- src/odbc/odbc.c	2004-05-30 04:06:43.000000000 -0400
++++ 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.6_pre2.ebuild b/app-office/mdbtools/mdbtools-0.6_pre2.ebuild
new file mode 100644
index 000000000000..5dc2bf5ae57b
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-0.6_pre2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2.ebuild,v 1.1 2009/01/01 10:22:07 graaff Exp $
+
+WANT_AUTOMAKE="1.7"
+
+inherit eutils autotools
+
+MY_P=${P/_/}
+S="${WORKDIR}/${PN}-cvs-20050624"
+
+DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="http://sourceforge.net/projects/mdbtools"
+SRC_URI="mirror://gentoo/${PN}-cvs-20050624.tar.gz"
+
+IUSE="gnome odbc"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/glib-2
+	sys-libs/ncurses
+	sys-libs/readline
+	gnome? (
+		>=gnome-base/libglade-2
+		>=gnome-base/libgnomeui-2 )
+	odbc? ( >=dev-db/unixODBC-2.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/flex-2.5.0
+	>=sys-devel/bison-1.35"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	# This is necessary since the upstream tarball was created with a
+	# buggy libtool, and the .so suffix in library names is lost in
+	# some platforms (e.g. amd64).  Starting with libtool 2.2.4 it is
+	# also necessary to remove the acinclude.m4 file since it contains
+	# an old libtool.m4 that is obsolete, #227257.
+	rm "${S}"/acinclude.m4
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+	use odbc && myconf="${myconf} --with-unixodbc=/usr"
+
+	econf --enable-sql \
+		${myconf} || die "configure failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	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
+}