Version bump. Translation updates. Cryptographic support.

(Portage version: 2.2_rc88/cvs/Linux x86_64)

7 files changed, 330 insertions, 1 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index ff598de996dd..aac0671f9e5c 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,16 @@
 # 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.149 2010/09/13 20:59:26 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.150 2010/09/29 22:12:54 eva Exp $
+
+*libgda-4.2.0 (29 Sep 2010)
+
+  29 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> +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,
+  +files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch,
+  metadata.xml:
+  Version bump. Translation updates. Cryptographic support.
 
   13 Sep 2010; Gilles Dartiguelongue <eva@gentoo.org> libgda-4.1.10.ebuild:
   gnome-keyring does not depend on the gtk USE flag.
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
new file mode 100644
index 000000000000..4c1aca08642a
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.0-fix-build-order.patch
@@ -0,0 +1,36 @@
+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
new file mode 100644
index 000000000000..d35365ffb4cd
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.0-fix-undefined-mdb.patch
@@ -0,0 +1,35 @@
+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
new file mode 100644
index 000000000000..ac72131a3113
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.0-json-libcrypto-automagic.patch
@@ -0,0 +1,80 @@
+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.0-missing-include-in-keyword_hash-generator.patch b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
new file mode 100644
index 000000000000..5e7dd6147287
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.2.0-missing-include-in-keyword_hash-generator.patch
@@ -0,0 +1,27 @@
+From 9f219a98731085ef9588622ecdc9d7ba93de92bb Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 29 Sep 2010 23:53:54 +0200
+Subject: [PATCH] Fix missing include in keyword_hash generator
+
+---
+ libgda/sqlite/mkkeywordhash.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c
+index dc6ce89..28f4f83 100644
+--- a/libgda/sqlite/mkkeywordhash.c
++++ b/libgda/sqlite/mkkeywordhash.c
+@@ -370,6 +370,10 @@ main (int argc, char **argv)
+ 	}
+ 
+ 	/* Begin generating code */
++	printf("#include <stdio.h>\n");
++	printf("#include <string.h>\n");
++	printf("#include <glib.h>\n");
++
+ 	printf("/* Hash score: %d */\n", bestCount);
+ 	printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : "");
+ 	printf("  /* zText[] encodes %d bytes of keywords in %d bytes */\n",
+-- 
+1.7.3
+
diff --git a/gnome-extra/libgda/libgda-4.2.0.ebuild b/gnome-extra/libgda/libgda-4.2.0.ebuild
new file mode 100644
index 000000000000..8dea7bd4a635
--- /dev/null
+++ b/gnome-extra/libgda/libgda-4.2.0.ebuild
@@ -0,0 +1,137 @@
+# 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.2.0.ebuild,v 1.1 2010/09/29 22:12:54 eva Exp $
+
+EAPI="3"
+
+inherit autotools 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
+IUSE="berkdb bindist canvas doc firebird freetds gnome-keyring gtk graphviz http +introspection json ldap mysql oci8 odbc postgres sourceview ssl xbase"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~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
+	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 ) )
+	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 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.18
+	>=dev-util/intltool-0.35.5
+	>=app-text/gnome-doc-utils-0.9
+	>=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() {
+	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
+		--disable-scrollkeeper
+		--disable-static
+		--enable-system-sqlite
+		$(use_with berkdb bdb /usr)
+		$(use_with freetds tds /usr)
+		$(use_with gnome-keyring)
+		$(use_with gtk ui)
+		$(use_enable 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)
+
+	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_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"
+
+	# Fix compilation failure of keyword_hash.c, upstream #630959
+	epatch "${FILESDIR}/${P}-missing-include-in-keyword_hash-generator.patch"
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
+}
+
+src_test() {
+	emake check HOME=$(unset HOME; echo "~") || die "tests failed"
+}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 0ecc26db4d8e..99f3e02a62ae 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -4,6 +4,10 @@
 <herd>gnome</herd>
 <use>
 	<flag name="canvas">Enables support for <pkg>x11-libs/goocanvas</pkg></flag>
+	<flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+		introspection</flag>
+	<flag name="json">Enable support for JSON format</flag>
 	<flag name='mdb'>Enables Microsoft Access DB support</flag>
 	<flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
 	<flag name='xbase'>Enables support for xbase databases (dBase, FoxPro,