Version bump with various bugfixes.

(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

4 files changed, 258 insertions, 1 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 5f21e13827f3..ac80f583a8c7 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.218 2013/06/30 15:24:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.219 2013/07/28 21:30:30 tetromino Exp $
+
+*libgda-5.1.2 (28 Jul 2013)
+
+  28 Jul 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgda-5.1.2.ebuild, +files/libgda-5.1.2-graphviz.patch, metadata.xml:
+  Version bump with various bugfixes.
 
   30 Jun 2013; Justin Lecher <jlec@gentoo.org> libgda-5.0.4.ebuild,
   libgda-5.1.1-r1.ebuild, metadata.xml:
diff --git a/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch b/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch
new file mode 100644
index 000000000000..b9242275d3a0
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.1.2-graphviz.patch
@@ -0,0 +1,100 @@
+From 071bd53b80621cf2bf3cea9ef2a97c5b3fc56ee6 Mon Sep 17 00:00:00 2001
+From: Vivien Malerba <malerba@gnome-db.org>
+Date: Tue, 30 Apr 2013 20:51:04 +0200
+Subject: [PATCH] Allow compiling even with old Graphviz API
+
+cf changes made in commit #cc5d429567e21ec62bf61b7e3b54348af11965b9
+---
+ configure.ac                          | 19 +++++++++++++++++++
+ tools/browser/canvas/browser-canvas.c | 23 +++++++++++++++++++++--
+ 2 files changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0a61cef..84aad65 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -251,6 +251,25 @@ then
+ 				AC_MSG_ERROR([Graphviz support requested but not found.])
+ 			fi
+ 			have_graphviz=no])
++		if test "x$have_graphviz" = "xyes"
++		then
++			dnl test if new API is supported
++			AC_MSG_CHECKING([whether Graphviz's new API is supported])
++			AC_COMPILE_IFELSE([AC_LANG_SOURCE([
++#include <gvc.h>
++int main() {
++    Agraph_t *graph;
++    graph = agopen ("BrowserCanvasLayout", Agdirected, NULL);
++    return 0;
++}
++])],
++                        graphviz_new_api=yes, graphviz_new_api=no)
++
++			AC_MSG_RESULT($graphviz_new_api)
++			if test "$graphviz_new_api" = "yes"; then
++			   	AC_DEFINE(GRAPHVIZ_NEW_API,[1],[define if Graphviz's new API is available])
++			fi
++		fi
+ 	fi
+ 
+ 	PKG_CHECK_MODULES(GLADE, "gladeui-2.0", [
+diff --git a/tools/browser/canvas/browser-canvas.c b/tools/browser/canvas/browser-canvas.c
+index b228fd3..e173c1b 100644
+--- a/tools/browser/canvas/browser-canvas.c
++++ b/tools/browser/canvas/browser-canvas.c
+@@ -851,6 +851,7 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
+ 	if (!gvc)
+ 		gvc = gvContext ();
+ 
++#ifdef GRAPHVIZ_NEW_API
+ 	graph = agopen ("BrowserCanvasLayout", Agdirected, NULL);
+         agnode (graph, "shape", "box");
+         agset (graph, "height", ".1");
+@@ -858,6 +859,15 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
+         agset (graph, "fixedsize", "true");
+         agset (graph, "pack", "true");
+ 	agset (graph, "packmode", "node");
++#else
++	graph = agopen ("BrowserCanvasLayout", AGRAPH);
++        agnodeattr (graph, "shape", "box");
++        agnodeattr (graph, "height", ".1");
++        agnodeattr (graph, "width", ".1");
++        agnodeattr (graph, "fixedsize", "true");
++        agnodeattr (graph, "pack", "true");
++	agnodeattr (graph, "packmode", "node");
++#endif
+ 
+ 
+ 	if (class->get_layout_items)
+@@ -885,7 +895,11 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
+ 		nodes_list = g_slist_prepend (nodes_list, nl);
+ 		
+ 		tmp = g_strdup_printf ("%p", item);
++#ifdef GRAPHVIZ_NEW_API
+ 		node = agnode (graph, tmp, 0);
++#else
++		node = agnode (graph, tmp);
++#endif
+ 		nl->node = node;
+ 		g_hash_table_insert (nodes_hash, item, node);
+ 		
+@@ -928,8 +942,13 @@ browser_canvas_perform_auto_layout (BrowserCanvas *canvas, gboolean animate, Bro
+ 			Agnode_t *from_node, *to_node;
+ 			from_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, from);
+ 			to_node = (Agnode_t*) g_hash_table_lookup (nodes_hash, to);
+-			if (from_node && to_node)
+-			  agedge (graph, from_node, to_node, "", 0);
++			if (from_node && to_node) {
++#ifdef GRAPHVIZ_NEW_API
++				agedge (graph, from_node, to_node, "", 0);
++#else
++				agedge (graph, from_node, to_node);
++#endif
++			}
+ 		}
+ 	}
+ 
+-- 
+1.8.3.2
+
diff --git a/gnome-extra/libgda/libgda-5.1.2.ebuild b/gnome-extra/libgda/libgda-5.1.2.ebuild
new file mode 100644
index 000000000000..84a1fafe4e12
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.1.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.1.2.ebuild,v 1.1 2013/07/28 21:30:30 tetromino Exp $
+
+EAPI="5"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python{2_6,2_7} )
+#VALA_MIN_API_VERSION="0.18"
+#VALA_MAX_API_VERSION="0.18" # configure explicitly checks for 0.18
+#VALA_USE_DEPEND="vapigen"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python-single-r1 # vala
+
+DESCRIPTION="GNOME database access library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2+ LGPL-2+"
+
+IUSE="berkdb bindist canvas firebird gtk graphviz http +introspection json ldap libsecret mdb mysql oci8 postgres reports sourceview ssl" # vala
+REQUIRED_USE="
+	reports? ( ${PYTHON_REQUIRED_USE} )
+	canvas? ( gtk )
+	firebird? ( !bindist )
+	graphviz? ( gtk )
+	sourceview? ( gtk )"
+# firebird license is not GPL compatible
+SLOT="5/4" # subslot = libgda-5.0 soname version
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libxml2-2
+	dev-libs/libxslt
+	sys-libs/readline:=
+	sys-libs/ncurses:=
+	berkdb?   ( sys-libs/db )
+	!bindist? ( firebird? ( dev-db/firebird ) )
+	gtk? (
+		>=x11-libs/gtk+-3.0.0:3
+		canvas? ( x11-libs/goocanvas:2.0= )
+		sourceview? ( x11-libs/gtksourceview:3.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	http? ( >=net-libs/libsoup-2.24:2.4 )
+	introspection? ( >=dev-libs/gobject-introspection-1.30 )
+	json?     ( dev-libs/json-glib )
+	ldap?     ( net-nds/openldap:= )
+	libsecret? ( app-crypt/libsecret )
+	mdb?      ( >app-office/mdbtools-0.5:= )
+	mysql?    ( virtual/mysql:= )
+	postgres? ( dev-db/postgresql-base:= )
+	reports? (
+		${PYTHON_DEPS}
+		dev-java/fop
+		dev-python/reportlab )
+	ssl?      ( dev-libs/openssl:= )
+	>=dev-db/sqlite-3.6.22:3=
+"
+#	vala? ( dev-libs/libgee:0.8 )
+DEPEND="${RDEPEND}
+	>=app-text/gnome-doc-utils-0.9
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.6
+	virtual/pkgconfig
+	java? ( virtual/jdk:1.6 )"
+#	vala? ( $(vala_depend) )
+
+# FIXME: lots of tests failing. Check if they still fail in 5.1.2
+RESTRICT="test"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use reports && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use berkdb && append-cppflags "-I$(db_includedir)"
+
+	use reports ||
+		sed -e '/SUBDIRS =/ s/trml2html//' \
+			-e '/SUBDIRS =/ s/trml2pdf//' \
+			-i libgda-report/RML/Makefile.{am,in} || die
+
+	# fixed in 5.1.3
+	epatch "${FILESDIR}/${P}-graphviz.patch"
+
+	# Prevent file collisions with libgda:4
+	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
+	epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
+	epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
+	# Move files with mv (since epatch can't handle rename diffs) and
+	# update pre-generated gtk-doc files (for non-git versions of libgda)
+	local f
+	for f in tools/browser/doc/gda-browser* ; do
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in tools/browser/doc/html/gda-browser.devhelp* ; do
+		sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
+			-i ${f} || die "sed ${f} failed"
+		mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
+	done
+	for f in control-center/data/*_gda-control-center.png ; do
+		mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
+			die "mv ${f} failed"
+	done
+
+	eautoreconf
+	gnome2_src_prepare
+	java-pkg-opt-2_src_prepare
+	# use vala && vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-scrollkeeper \
+		--disable-static \
+		--enable-system-sqlite \
+		$(use_with berkdb bdb /usr) \
+		$(use_with canvas goocanvas) \
+		$(use_with firebird firebird /usr) \
+		$(use_with graphviz) \
+		$(use_with gtk ui) \
+		$(use_with http libsoup) \
+		$(use_enable introspection) \
+		"$(use_with java java $JAVA_HOME)" \
+		$(use_enable json) \
+		$(use_with ldap) \
+		$(use_with libsecret) \
+		$(use_with mdb mdb /usr) \
+		$(use_with mysql mysql /usr) \
+		$(use_with oci8 oracle) \
+		$(use_with postgres postgres /usr) \
+		$(use_enable ssl crypto) \
+		$(use_with sourceview gtksourceview) \
+		--disable-default-binary \
+		--disable-vala
+	# vala bindings fail to build
+}
+
+src_install() {
+	gnome2_src_install
+	if use reports; then
+		for t in trml2{html,pdf}; do
+			python_scriptinto /usr/share/libgda-5.0/gda_${t}
+			python_doscript libgda-report/RML/${t}/${t}.py
+		done
+	fi
+}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 6997cb05fe1c..c0e384d11509 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -7,6 +7,8 @@
 		which is not GPL compatible.</flag>
     <flag name="canvas">Enable support for <pkg>x11-libs/goocanvas</pkg></flag>
     <flag name="http">Enable embedded <pkg>net-libs/libsoup</pkg> based server</flag>
+	<flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to
+		store login credentials</flag>
     <flag name="json">Enable support for JSON format</flag>
     <flag name="mdb">Enable support for Microsoft Access database using 
 		<pkg>app-office/mdbtools</pkg></flag>