Version bump for both slots; fixes several bugs, including building with USE=doc (bug #388501). Enable mdb support for 4.2.11. Enable vala bindings for 5.0.1 (they build now). Enable tests for 5.0.1 (the test suite now passes when running from portage).

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64

5 files changed, 302 insertions, 10 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index bba60ea0c31a..514297dabf3b 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.185 2011/11/01 11:29:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.186 2011/11/16 18:38:49 tetromino Exp $
+
+*libgda-5.0.1 (16 Nov 2011)
+*libgda-4.2.11 (16 Nov 2011)
+
+  16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgda-4.2.11.ebuild, +libgda-5.0.1.ebuild, metadata.xml:
+  Version bump for both slots; fixes several bugs, including building with
+  USE=doc (bug #388501). Enable mdb support for 4.2.11. Enable vala bindings
+  for 5.0.1 (they build now). Enable tests for 5.0.1 (the test suite now passes
+  when running from portage).
 
 *libgda-4.2.10 (01 Nov 2011)
 
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 1a8e7b341dfe..ab30be41d7af 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libgda-4.2.0-missing-include-in-keyword_hash-generator.patch 897 RMD160 2a879a730831b7d6c05bf3a48df542cbf025adc4 SHA1 d76018f2b545290174cce55be7c4561edf7772bc SHA256 7cc133de8931b1dc86a08ee7a620e8b9218071723549734ea2290440318a7b8f
 AUX libgda-4.2.2-fix-build-order.patch 738 RMD160 b17874c3aab6b50b342e612e24bc706f4b6a077d SHA1 f72ecb1dd74a776decfb8fc6c7de1b0ceec90d43 SHA256 d8a293598d8277b766f5971066b27aeab45e2ead491b2250b5d700577c44a0e1
@@ -9,17 +9,21 @@ AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 RMD160 e7675db0e35b98d4f
 AUX libgda-4.99.4-disable-broken-tests.patch 363 RMD160 3c2559b32d5a01b9377782f7130980b68ca85f8a SHA1 360074a84e6eadc7480a8e1adeceedce344af0d7 SHA256 cbc8b5bbd5577538f68d1625616f3812ebb1976d05b356b13feb491eb1174f5c
 AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 RMD160 b8b5a084b9e548b913595ae94defa9320b17febe SHA1 e702517de6d0fb128f46513a7d9bd839d20930ba SHA256 81c6089b0899ef43428e5e6f182df153c85730e879f2ecefa7c769b0073c756d
 DIST libgda-4.2.10.tar.xz 11235176 RMD160 37cbcfb170e7994e5c08db8c6d2eab07a4734a93 SHA1 0d940b9783582dcc3a4e35568d79e2bd662df63a SHA256 cfaf228c62fbdb461c3bfedad919d5dfeb6a2e624c223910e275a53b97d3a431
+DIST libgda-4.2.11.tar.xz 11253296 RMD160 4dc6d0ed9edaa479e937183eeab74a18e7e9518b SHA1 f655b894b4d339018b80dbb8468ebe671f898501 SHA256 2359ccea3870de1c0162689b225a2546f2f883d7c12d29a0885828cd3f5fe575
 DIST libgda-4.2.9.tar.xz 11215344 RMD160 fd172c5aac8ed76b97b9c66f0558c79ad373d3d1 SHA1 57205e2ec041f8138a85b7b5e5728dc0f1266fb6 SHA256 bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814
 DIST libgda-5.0.0.tar.xz 11620540 RMD160 9fe23239a774f487c30c7cf1af63f8101ed62271 SHA1 fa4d0d7eae7fa7842329fe4af3ff92788a8da6d4 SHA256 b8f14505d8e921b97b20a0ff99e10c611bd57c317b0f081e7f76bc2c87ae1fea
+DIST libgda-5.0.1.tar.xz 11634924 RMD160 3018ed1db26843f523f3df871a81db3d7505bc2a SHA1 78a66f09ae1435ea0f0a0eecfb9e2af36c11d5cf SHA256 1f8ed9105702bf81ce3c546292b6148e8de428f69737ad9949b8c6f81b33bdaf
 EBUILD libgda-4.2.10.ebuild 3450 RMD160 4bb8c8df9babb279694ce167f879d87ee14460ae SHA1 3ed32b4063edfdd46ed2d36528aa149384c1975e SHA256 29d8a0f7c51133bd5b90016c79ff481f9258d11c8394b28765cafb8122c4bbb4
+EBUILD libgda-4.2.11.ebuild 3266 RMD160 316e53bd77d6ceb2cd96d8175d0a4d012329acaf SHA1 6ccb97d0130f8f784f4d6c2df33696253009f9cf SHA256 1f5304528c124581ce5855766ac643b9b54ff619d6a9119e724bb6a9b79ad745
 EBUILD libgda-4.2.9.ebuild 3642 RMD160 67a1f3fe5aeba77e75a83f5064d47fab0e163d20 SHA1 51d3188c997bb5ba63de3d5af6ea3c32727e80a1 SHA256 8527ca86de488a0ae5efafab87c1a0acb04b7938ef2275085e2990ae20f9b6d6
 EBUILD libgda-5.0.0.ebuild 4944 RMD160 b3c738d36c0cb35b2fe7611cff6712619e49e801 SHA1 4f3d4fae94759940cb475edd06e162cc0d4ddbef SHA256 50d85fdce06dc07f7901ee40a4e8851d738c8b782978a7ff36501a8d91dd848c
-MISC ChangeLog 28261 RMD160 fe34f2236b53dc995689f2c1249fd351700d43ca SHA1 26c6940b8e8cc006be10b837c8bc920c89993d72 SHA256 9935493585b8f0374692c41ec28e77c690a6a823d229624cd2f3a0c448d726ea
-MISC metadata.xml 685 RMD160 947db2a1525c1737c4c183771f55e422a3abc95a SHA1 ba263d5f1851c2295214bb9edc868f77bce0033e SHA256 8482c362762fa4d00ccd08bac5d9fbe2468f055c4fd9a7eb2c9d31a9987cc611
+EBUILD libgda-5.0.1.ebuild 4738 RMD160 d962b2e400150b5b048867a8b0bc3360b54db044 SHA1 bbc3e822c3bb798ac50915aec845908302fb7741 SHA256 a24b0a3c63ce8aa5360622b0b99cedd261587fdaa3d092d00dc65ac6add01a19
+MISC ChangeLog 28706 RMD160 2cb93e3d149d37a797a9870a5be465874af4910c SHA1 ebbd2be89985b9da26468edfc87de382d21a8630 SHA256 46be64dd50d57c4acd7d12642acd93090f8205fad4d21ffad046f00921c2f1ce
+MISC metadata.xml 755 RMD160 6913b2cf330e2b6658b4ab8f56125861d9ab8452 SHA1 754844884f251071ca33075bbf999db5c7b67698 SHA256 d9518a1c92b5c3840f451010f0c4d34780f102e1f16debdc705f5f463416e811
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6v2CUACgkQCaWpQKGI+9S7tgCfWAfottHzBP4upWjwDAOuEjUy
-ua0An0/ew3lFo+II2S0Ag+ib/ScEhSoG
-=9pBB
+iF4EAREIAAYFAk7EA0AACgkQdjK8w9WeBnBavAD+P1lloUGiivzvvStFOabJwXRa
+rra0sapoQIsC9S6mdeQBAJvAz+SYBSiuxSr4uQb8bS4AosSAhOhr927Fj2rl33qu
+=2Hpy
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-4.2.11.ebuild b/gnome-extra/libgda/libgda-4.2.11.ebuild
new file mode 100644
index 000000000000..951cca6eab39
--- /dev/null
+++ b/gnome-extra/libgda/libgda-4.2.11.ebuild
@@ -0,0 +1,117 @@
+# 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.11.ebuild,v 1.1 2011/11/16 18:38:49 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+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"
+
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
+
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="
+	app-text/iso-codes
+	>=dev-libs/glib-2.16:2
+	>=dev-libs/libxml2-2:2
+	dev-libs/libxslt
+	dev-libs/libunique:1
+	sys-libs/readline
+	sys-libs/ncurses
+	>=dev-db/sqlite-3.6.22:3
+	berkdb?	( sys-libs/db )
+	!bindist? ( firebird? ( dev-db/firebird ) )
+	gtk? (
+		|| ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 )
+		canvas? ( x11-libs/goocanvas:0 )
+		sourceview? ( x11-libs/gtksourceview:2.0 )
+		graphviz? ( media-gfx/graphviz )
+	)
+	gnome-keyring? ( gnome-base/libgnome-keyring )
+	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 )
+	mdb?	( >app-office/mdbtools-0.5 )
+	mysql?	( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	ssl?	( dev-libs/openssl )"
+
+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 )"
+
+# 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."
+			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
+
+	# Disable vala bindings, they collide with dev-lang/vala's libgda-4.0.vapi
+	G2CONF="${G2CONF}
+		--with-unique
+		--disable-scrollkeeper
+		--disable-static
+		--enable-system-sqlite
+		--disable-vala
+		$(use_with berkdb bdb /usr)
+		$(use_with gnome-keyring)
+		$(use_with gtk ui)
+		$(use_with http libsoup)
+		$(use_enable introspection)
+		$(use_enable introspection gda-gi)
+		$(use_enable introspection gdaui-gi)
+		$(use_with java java $JAVA_HOME)
+		$(use_enable json)
+		$(use_with ldap)
+		$(use_with mdb mdb /usr)
+		$(use_with mysql mysql /usr)
+		$(use_with postgres postgres /usr)
+		$(use_enable ssl crypto)"
+
+	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}
+		--disable-default-binary"
+
+	export XDG_DATA_HOME="${T}/.local"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix compilation failure of keyword_hash.c, upstream #630959
+	epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
+}
diff --git a/gnome-extra/libgda/libgda-5.0.1.ebuild b/gnome-extra/libgda/libgda-5.0.1.ebuild
new file mode 100644
index 000000000000..990b6e616546
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.0.1.ebuild
@@ -0,0 +1,160 @@
+# 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-5.0.1.ebuild,v 1.1 2011/11/16 18:38:49 tetromino Exp $
+
+EAPI="4"
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="2"
+
+inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
+
+DESCRIPTION="Gnome Database Access Library"
+HOMEPAGE="http://www.gnome-db.org/"
+LICENSE="GPL-2 LGPL-2"
+
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
+SLOT="5"
+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: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 )
+	)
+	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 )
+	mdb?      ( >app-office/mdbtools-0.5 )
+	mysql?    ( virtual/mysql )
+	postgres? ( dev-db/postgresql-base )
+	ssl?      ( dev-libs/openssl )
+	>=dev-db/sqlite-3.6.22:3"
+
+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 )
+	vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )"
+
+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."
+			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}
+		--disable-scrollkeeper
+		--disable-static
+		--enable-system-sqlite
+		$(use_with berkdb bdb /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)
+		$(use_with mdb mdb /usr)
+		$(use_with mysql mysql /usr)
+		$(use_with postgres postgres /usr)
+		$(use_enable ssl crypto)
+		$(use_enable vala)"
+
+	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}
+		--disable-default-binary"
+
+	export XDG_DATA_HOME="${T}/.local"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix compilation failure of keyword_hash.c, upstream #630959
+	#epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
+
+	# Disable broken tests so we can check the others
+	epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.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
+	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
+
+	python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
+
+	# Fix valac version
+	sed -e 's:"$VALA_BINDIR/valac":"$VALA_BINDIR/valac-0.14":' \
+		-i configure.ac || die "sed failed"
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	local d
+	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+		python_mod_optimize ${d}
+	done
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	local d
+	for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
+		python_mod_cleanup ${d}
+	done
+}
diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index 8e73c78908ef..55fa7c486325 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.xml
@@ -3,13 +3,14 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="canvas">Enables support for <pkg>x11-libs/goocanvas</pkg></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="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
 		introspection</flag>
 	<flag name="json">Enable support for JSON format</flag>
-	<flag name="mdb">Enable support for Microsoft Access Database using 
+	<flag name="mdb">Enable support for Microsoft Access database using 
 		<pkg>app-office/mdbtools</pkg></flag>
 	<flag name="sourceview">Enable support for <pkg>x11-libs/gtksourceview</pkg></flag>
+	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>