Version bump, remove old.

(Portage version: 2.1.9.41/cvs/Linux x86_64)

9 files changed, 41 insertions, 366 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 22a59c3ecf95..2c96820800f0 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/libgda
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.155 2010/12/05 18:03:22 eva Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.156 2011/02/23 22:14:48 pacho Exp $
+
+*libgda-4.2.5 (23 Feb 2011)
+
+  23 Feb 2011; Pacho Ramos <pacho@gentoo.org>
+  -files/libgda-4.0.2-libsoup-magic.patch, -files/libgda-4.0.2-sandbox.patch,
+  -libgda-4.1.10.ebuild, -libgda-4.2.0.ebuild,
+  -files/libgda-4.2.0-fix-build-order.patch,
+  -files/libgda-4.2.0-fix-undefined-mdb.patch,
+  -files/libgda-4.2.0-json-libcrypto-automagic.patch, +libgda-4.2.5.ebuild,
+  +files/libgda-4.2.5-missing-m4.patch:
+  Version bump, remove old.
 
   05 Dec 2010; Gilles Dartiguelongue <eva@gentoo.org> libgda-4.2.2.ebuild:
   Pin glib/gtk+ to SLOT 2 and update test function from live ebuild.
diff --git a/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch b/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch
deleted file mode 100644
index be523d725717..000000000000
--- a/gnome-extra/libgda/files/libgda-4.0.2-libsoup-magic.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 548667d..9b58cb2 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1339,12 +1316,23 @@ export LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH"
- dnl ************************
- dnl Check for libsoup
- dnl ************************
--PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, have_libsoup=yes, have_libsoup=no)
--AM_CONDITIONAL(LIBSOUP, test x"$have_libsoup" = "xyes")
--if test x"$have_libsoup" = "xyes"
-+
-+AC_ARG_WITH(libsoup,
-+	AS_HELP_STRING([--with-libsoup], [Enable libsoup support]),
-+	,with_soup=auto)
-+
-+if test "$with_libsoup" = "auto" -a "$with_libsoup" = "yes"
- then
--        LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DHAVE_LIBSOUP"
-+	PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, [
-+		AC_DEFINE(HAVE_LIBSOUP, [], [libsoup support enable])
-+		have_libsoup=yes], [
-+		if test "$with_libsoup" = "yes"
-+		then
-+			AC_MSG_ERROR([libsoup support requested but not found.])
-+		fi
-+		have_libsoup=no])
- fi
-+AM_CONDITIONAL(LIBSOUP, test "$have_libsoup" = "yes")
- AC_SUBST(LIBSOUP_CFLAGS)
- AC_SUBST(LIBSOUP_LIBS)
- 
diff --git a/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch b/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch
deleted file mode 100644
index f40de2dc532a..000000000000
--- a/gnome-extra/libgda/files/libgda-4.0.2-sandbox.patch
+++ /dev/null
@@ -1,39 +0,0 @@
----
- Allow building without sandbox violations.
-
-diff --git a/libgda-report/RML/trml2html/Makefile.am b/libgda-report/RML/trml2html/Makefile.am
-index 9b1e390..dd050cc 100644
---- a/libgda-report/RML/trml2html/Makefile.am
-+++ b/libgda-report/RML/trml2html/Makefile.am
-@@ -3,10 +3,10 @@ files = __init__.py  \
- 	utils.py
- 
- install-exec-local:
--	-mkdir -p $(bindir)/gda_trml2html
--	-cd $(top_srcdir)/libgda-report/RML/trml2html && $(INSTALL_PROGRAM) $(files) $(bindir)/gda_trml2html
-+	-mkdir -p $(DESTDIR)$(bindir)/gda_trml2html
-+	-cd $(top_srcdir)/libgda-report/RML/trml2html && $(INSTALL_PROGRAM) $(files) $(DESTDIR)$(bindir)/gda_trml2html
- 
- uninstall-local:
--	-rm -rf $(bindir)/gda_trml2html
-+	-rm -rf $(DESTDIR)$(bindir)/gda_trml2html
- 
- EXTRA_DIST = $(files)
-diff --git a/libgda-report/RML/trml2pdf/Makefile.am b/libgda-report/RML/trml2pdf/Makefile.am
-index 7c241fe..aeab872 100644
---- a/libgda-report/RML/trml2pdf/Makefile.am
-+++ b/libgda-report/RML/trml2pdf/Makefile.am
-@@ -4,10 +4,10 @@ files = color.py \
- 	utils.py
- 
- install-exec-local:
--	-mkdir -p $(bindir)/gda_trml2pdf
--	-cd $(top_srcdir)/libgda-report/RML/trml2pdf && $(INSTALL_PROGRAM) $(files) $(bindir)/gda_trml2pdf
-+	-mkdir -p $(DESTDIR)$(bindir)/gda_trml2pdf
-+	-cd $(top_srcdir)/libgda-report/RML/trml2pdf && $(INSTALL_PROGRAM) $(files) $(DESTDIR)$(bindir)/gda_trml2pdf
- 
- uninstall-local:
--	-rm -rf $(bindir)/gda_trml2pdf
-+	-rm -rf $(DESTDIR)$(bindir)/gda_trml2pdf
- 
- EXTRA_DIST = $(files)
diff --git a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch b/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch
deleted file mode 100644
index 4c1aca08642a..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f39858f84155d0346d31a2607997257a54e246ff Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 29 Sep 2010 23:45:46 +0200
-Subject: [PATCH] fix build order for xml_embedded.h
-
----
- libgda/sqlite/Makefile.am |    9 +++++----
- 1 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
-index 1d2df2c..ecce04b 100644
---- a/libgda/sqlite/Makefile.am
-+++ b/libgda/sqlite/Makefile.am
-@@ -58,9 +58,9 @@ sqlitesources = \
- 	gda-sqlite.h \
- 	keywords_hash.h \
- 	gda-symbols-util.h \
--	gda-symbols-util.c
--
--$(libgda_sqlite_la_OBJECTS): xml_embedded.h keywords_hash.c
-+	gda-symbols-util.c \
-+	xml_embedded.h \
-+	keywords_hash.c
- 
- libgda_sqlite_la_SOURCES = $(sqlitesources)
- libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
-@@ -85,4 +85,5 @@ gdainclude_HEADERS=$(sqliteheaders)
- 
- EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list
- 
--CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) xml_embedded.h mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c
-+CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES)
-+BUILT_SOURCES = xml_embedded.h keywords_hash.c
--- 
-1.7.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch b/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch
deleted file mode 100644
index d35365ffb4cd..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f52ea81599e21a63b29933f7b7b5cc15754125dd Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 29 Sep 2010 23:28:58 +0200
-Subject: [PATCH] Fix error: conditional "MDB" was never defined
-
----
- m4/mdbtools.m4 |    4 +---
- 1 files changed, 1 insertions(+), 3 deletions(-)
-
-diff --git a/m4/mdbtools.m4 b/m4/mdbtools.m4
-index 2421ef4..544634b 100644
---- a/m4/mdbtools.m4
-+++ b/m4/mdbtools.m4
-@@ -152,10 +152,7 @@ int main() {
- 	if test "x$MDB_LIBS" = x
- 	then
- 	    AC_MSG_NOTICE([MDB backend not used])
--	    AM_CONDITIONAL(MDB,[false])
- 	else
--	    AC_DEFINE(HAVE_MDB,[1],[Have MDB])
--	    AM_CONDITIONAL(MDB,[true])
-     	    mdbtools_found=yes
- 
-   	    save_CFLAGS="$CFLAGS"
-@@ -199,6 +196,7 @@ int main() {
- 	fi
-     fi
- 
-+    AM_CONDITIONAL(MDB,[test "$mdbtools_found" = "yes"])
-     AC_SUBST(MDB_LIBS)
-     AC_SUBST(MDB_CFLAGS)
- ])
--- 
-1.7.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch b/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch
deleted file mode 100644
index ac72131a3113..000000000000
--- a/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 308a341ae545d991e0ad8f18e08050df393edbfa Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Wed, 29 Sep 2010 22:39:19 +0200
-Subject: [PATCH] Fix json/libcrypto automagic
-
----
- configure.ac |   41 +++++++++++++++++++++++++++++------------
- 1 files changed, 29 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index df31138..5abaa31 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -403,13 +403,21 @@ dnl ******************************
- dnl Checks for json-glib
- dnl ******************************
- 
-+AC_ARG_ENABLE([json],
-+	AS_HELP_STRING([--disable-json], [Enable support for JSON]),
-+	,
-+	[enable_json=yes])
-+
- JSON_GLIB_MODULES="json-glib-1.0"
--PKG_CHECK_MODULES(JSON_GLIB, $JSON_GLIB_MODULES, have_json=yes, have_json=no)
--AM_CONDITIONAL(HAVE_JSON_GLIB, test x"$have_json" = "xyes")
--if test x"$have_json" = "xyes"
--then
--        JSON_GLIB_CFLAGS="$JSON_GLIB_CFLAGS -DHAVE_JSON_GLIB"
--fi
-+PKG_CHECK_MODULES(JSON_GLIB, $JSON_GLIB_MODULES,
-+	AC_DEFINE(HAVE_JSON_GLIB, [], [Defined if JSON support is enabled])
-+	have_json=yes,
-+	if test "$enable_json" = "yes"; then
-+		AC_MSG_ERROR([JSON support requested but not found])
-+	fi
-+	have_json=no
-+)
-+AM_CONDITIONAL(HAVE_JSON_GLIB, [test "$have_json" = "yes"])
- AC_SUBST(JSON_GLIB_CFLAGS)
- AC_SUBST(JSON_GLIB_LIBS)
- 
-@@ -422,13 +430,21 @@ dnl ******************************
- dnl Checks for libcrypto
- dnl ******************************
- 
-+AC_ARG_ENABLE([crypto],
-+	AS_HELP_STRING([--disable-crypto], [Enable cryptographic support for SQL]),
-+	,
-+	[enable_crypto=yes])
-+
- LIBCRYPTO_MODULES="libcrypto"
--PKG_CHECK_MODULES(LIBCRYPTO, $LIBCRYPTO_MODULES, have_crypto=yes, have_crypto=no)
--AM_CONDITIONAL(HAVE_LIBCRYPTO, test x"$have_crypto" = "xyes")
--if test x"$have_crypto" = "xyes"
--then
--        LIBCRYPTO_CFLAGS="$LIBCRYPTO_CFLAGS -DHAVE_LIBCRYPTO"
--fi
-+PKG_CHECK_MODULES(LIBCRYPTO, $LIBCRYPTO_MODULES,
-+	AC_DEFINE(HAVE_LIBCRYPTO, [], [Defined if cryptographic support is enabled])
-+	have_crypto=yes,
-+	if test "$enable_crypto" = "yes"; then
-+		AC_MSG_ERROR([libcrypto support requested but not found])
-+	fi
-+	have_crypto=no
-+)
-+AM_CONDITIONAL(HAVE_LIBCRYPTO, [test "$have_crypto" = "yes"])
- AC_SUBST(LIBCRYPTO_CFLAGS)
- AC_SUBST(LIBCRYPTO_LIBS)
- 
-@@ -1832,6 +1848,7 @@ dnl echo "      mSQL = `if test x$msqldir != x; then echo yes; else echo no; fi`
- dnl echo "      ODBC = `if test x$odbcdir != x; then echo yes; else echo no; fi`"
- echo "      Oracle = `if test x$oracledir != x; then echo yes; else echo no; fi`"
- echo "      PostgreSQL = `if test x$postgresdir != x; then echo yes; else echo no; fi`"
-+echo "      JSON = `if test x$have_json != xyes; then echo no; else echo yes; fi`"
- echo "      SQLite = yes `if test x$have_sqlite = xyes; then echo '(from system installation)'; else echo '(embedded)'; fi`"
- echo "      SQLCipher = `if test x$have_crypto != xyes; then echo no; else echo yes; fi`"
- dnl echo "      Sybase = `if test x$sybasedir != x; then echo yes; else echo no; fi`"
--- 
-1.7.3
-
diff --git a/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch b/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch
new file mode 100644
index 000000000000..bea88cf70bbb
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.5-missing-m4.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index 7ce16f8..3f5ae10 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,6 +5,7 @@ m4_define([gda_stable],
+ 	m4_if(m4_eval(minor % 2), [0], [yes], [no]))
+ AC_CONFIG_MACRO_DIR([m4])
+ m4_include(m4/introspection.m4)
++m4_include(m4/dk-warn.m4)
+ m4_include(m4/mdbtools.m4)
+ m4_include(m4/bdb.m4)
+ m4_include(m4/mysql.m4)
diff --git a/gnome-extra/libgda/libgda-4.1.10.ebuild b/gnome-extra/libgda/libgda-4.1.10.ebuild
deleted file mode 100644
index b1869733d6bc..000000000000
--- a/gnome-extra/libgda/libgda-4.1.10.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.1.10.ebuild,v 1.2 2010/09/13 20:59:26 eva Exp $
-
-EAPI="2"
-
-inherit db-use eutils flag-o-matic gnome2 java-pkg-opt-2
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-# MDB support currently works with CVS only, so disable it in the meantime
-# experimental IUSE: introspection
-IUSE="berkdb bindist canvas doc firebird freetds gnome-keyring gtk graphviz ldap mysql oci8 odbc postgres sourceview xbase"
-SLOT="4"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND="
-	app-text/iso-codes
-	>=dev-libs/glib-2.16
-	>=dev-libs/libxml2-2
-	dev-libs/libxslt
-	dev-libs/libunique
-	sys-libs/readline
-	sys-libs/ncurses
-	>=net-libs/libsoup-2.24:2.4
-	berkdb?   ( sys-libs/db )
-	freetds?  ( >=dev-db/freetds-0.62 )
-	!bindist? ( firebird? ( dev-db/firebird ) )
-	gtk? (
-		>=x11-libs/gtk+-2.12
-		canvas? ( x11-libs/goocanvas )
-		sourceview? ( x11-libs/gtksourceview:2.0 )
-		graphviz? ( media-gfx/graphviz )
-	)
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-	ldap?     ( >=net-nds/openldap-2.0.25 )
-	mysql?    ( virtual/mysql )
-	odbc?     ( >=dev-db/unixODBC-2.0.6 )
-	postgres? ( dev-db/postgresql-base )
-	xbase?    ( dev-db/xbase )
-	>=dev-db/sqlite-3.6.22:3"
-#   json?     ( dev-libs/json-glib )
-#	mdb?      ( >app-office/mdbtools-0.5 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.18
-	>=dev-util/intltool-0.35.5
-	>=app-text/gnome-doc-utils-0.9
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# Tests are not really good
-RESTRICT="test"
-
-pkg_setup() {
-	if use canvas || use graphviz || use sourceview; then
-		if ! use gtk; then
-			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-			ewarn "Disabling for now."
-			G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-		else
-			G2CONF="${G2CONF}
-				$(use_with canvas goocanvas)
-				$(use_with graphviz)
-				$(use_with sourceview gtksourceview)"
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		--with-unique
-		--with-libsoup
-		--disable-scrollkeeper
-		--disable-introspection
-		--disable-static
-		--enable-system-sqlite
-		$(use_with gnome-keyring)
-		$(use_with gtk ui)
-		$(use_with berkdb bdb /usr)
-		$(use_with odbc odbc /usr)
-		$(use_with mysql mysql /usr)
-		$(use_with postgres postgres /usr)
-		$(use_with freetds tds /usr)
-		$(use_with xbase xbase /usr)
-		$(use_with ldap ldap /usr)
-		$(use_with java java $JAVA_HOME)
-		--without-mdb"
-#		$(use_with mdb mdb /usr)
-
-	if use bindist; then
-		# firebird license is not GPL compatible
-		G2CONF="${G2CONF} --without-firebird"
-	else
-		G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-	fi
-
-	use berkdb && append-cppflags "-I$(db_includedir)"
-	use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-	# Not in portage
-	G2CONF="${G2CONF}
-		--without-msql
-		--without-sybase
-		--without-ibmdb2
-		--disable-default-binary"
-}
-
-src_test() {
-	emake check HOME=$(unset HOME; echo "~") || die "tests failed"
-}
diff --git a/gnome-extra/libgda/libgda-4.2.0.ebuild b/gnome-extra/libgda/libgda-4.2.5.ebuild
index bd778814e99f..2ae74174308f 100644
--- a/gnome-extra/libgda/libgda-4.2.0.ebuild
+++ b/gnome-extra/libgda/libgda-4.2.5.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.0.ebuild,v 1.3 2010/11/01 12:18:13 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.5.ebuild,v 1.1 2011/02/23 22:14:48 pacho Exp $
 
 EAPI="3"
+GCONF_DEBUG="yes"
 
 inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2
 
@@ -11,7 +12,7 @@ HOMEPAGE="http://www.gnome-db.org/"
 LICENSE="GPL-2 LGPL-2"
 
 # MDB support currently works with CVS only, so disable it in the meantime
-IUSE="berkdb bindist canvas doc firebird freetds gnome-keyring gtk graphviz http +introspection json ldap mysql oci8 odbc postgres sourceview ssl xbase"
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json mysql oci8 postgres sourceview ssl"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
@@ -19,17 +20,16 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 # FIXME: autoconf is a hell of inconsistencies
 RDEPEND="
 	app-text/iso-codes
-	>=dev-libs/glib-2.16
+	>=dev-libs/glib-2.16:2
 	>=dev-libs/libxml2-2
 	dev-libs/libxslt
 	dev-libs/libunique
 	sys-libs/readline
 	sys-libs/ncurses
 	berkdb?   ( sys-libs/db )
-	freetds?  ( >=dev-db/freetds-0.62 )
 	!bindist? ( firebird? ( dev-db/firebird ) )
 	gtk? (
-		>=x11-libs/gtk+-2.12
+		|| ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
 		canvas? ( x11-libs/goocanvas )
 		sourceview? ( x11-libs/gtksourceview:2.0 )
 		graphviz? ( media-gfx/graphviz )
@@ -38,12 +38,9 @@ RDEPEND="
 	http? ( >=net-libs/libsoup-2.24:2.4 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
 	json?     ( dev-libs/json-glib )
-	ldap?     ( >=net-nds/openldap-2.0.25 )
 	mysql?    ( virtual/mysql )
-	odbc?     ( >=dev-db/unixODBC-2.0.6 )
 	postgres? ( dev-db/postgresql-base )
 	ssl?      ( dev-libs/openssl )
-	xbase?    ( dev-db/xbase )
 	>=dev-db/sqlite-3.6.22:3"
 #	mdb?      ( >app-office/mdbtools-0.5 )
 
@@ -54,12 +51,12 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
 # Tests are not really good
 RESTRICT="test"
 
 pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+
 	if use canvas || use graphviz || use sourceview; then
 		if ! use gtk; then
 			ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
@@ -79,19 +76,14 @@ pkg_setup() {
 		--disable-static
 		--enable-system-sqlite
 		$(use_with berkdb bdb /usr)
-		$(use_with freetds tds /usr)
 		$(use_with gnome-keyring)
 		$(use_with gtk ui)
 		$(use_with http libsoup)
 		$(use_enable introspection)
 		$(use_with java java $JAVA_HOME)
-		$(use_enable json)
-		$(use_with ldap ldap /usr)
 		$(use_with mysql mysql /usr)
-		$(use_with odbc odbc /usr)
 		$(use_with postgres postgres /usr)
 		$(use_enable ssl crypto)
-		$(use_with xbase xbase /usr)
 		--without-mdb"
 #		$(use_with mdb mdb /usr)
 
@@ -103,35 +95,31 @@ pkg_setup() {
 	fi
 
 	use berkdb && append-cppflags "-I$(db_includedir)"
+	# --disable-json doesn't work, upstream bug #636439
+	use json && G2CONF="${G2CONF} --enable-json"
 	use oci8 || G2CONF="${G2CONF} --without-oracle"
 
 	# Not in portage
 	G2CONF="${G2CONF}
-		--without-msql
-		--without-sybase
-		--without-ibmdb2
 		--disable-default-binary"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix automagic json-glib and libcrypto, upstream #630953
-	epatch "${FILESDIR}/${P}-json-libcrypto-automagic.patch"
-
-	# Fix undefined MDB, upstream #630955
-	epatch "${FILESDIR}/${P}-fix-undefined-mdb.patch"
-
 	# Fix build order for generated content, upstream #630958
-	epatch "${FILESDIR}/${P}-fix-build-order.patch"
+	epatch "${FILESDIR}/${PN}-4.2.2-fix-build-order.patch"
 
 	# Fix compilation failure of keyword_hash.c, upstream #630959
-	epatch "${FILESDIR}/${P}-missing-include-in-keyword_hash-generator.patch"
+	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
+
+	# Don't break when running autoreconf, upstream bug #639319
+	epatch "${FILESDIR}/${PN}-4.2.5-missing-m4.patch"
 
 	intltoolize --force --copy --automake || die
 	eautoreconf
 }
 
 src_test() {
-	emake check HOME=$(unset HOME; echo "~") || die "tests failed"
+	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
 }