Bump. Notable changes: introspection improvements, lots of bugfixes. This version theoretically adds vala bindings, but getting them to build is problematic. Remove bogus libunique dependency.

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

3 files changed, 183 insertions, 7 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 2e11e428c4de..82d6ecd7defa 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,14 @@
 # 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.182 2011/10/21 14:25:14 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.183 2011/10/30 05:58:42 tetromino Exp $
+
+*libgda-5.0.0 (30 Oct 2011)
+
+  30 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libgda-5.0.0.ebuild:
+  Bump. Notable changes: introspection improvements, lots of bugfixes. This
+  version theoretically adds vala bindings, but getting them to build is
+  problematic. Remove bogus libunique dependency.
 
   21 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> libgda-4.2.9.ebuild:
   x86 stable wrt bug #385699
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 6a83cad9784f..d178adb48157 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -11,15 +11,17 @@ AUX libgda-4.99.4-statement-rewriting-fix.patch 17054 RMD160 b8b5a084b9e548b9135
 DIST libgda-4.2.7.tar.bz2 12636540 RMD160 ab3587f3ed2d049cd1e7bd1f051188e7f2405470 SHA1 8c2b1a744ba50008fa230be0f0abebdb8ea9b0b9 SHA256 0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5
 DIST libgda-4.2.9.tar.xz 11215344 RMD160 fd172c5aac8ed76b97b9c66f0558c79ad373d3d1 SHA1 57205e2ec041f8138a85b7b5e5728dc0f1266fb6 SHA256 bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814
 DIST libgda-4.99.4.tar.xz 11621632 RMD160 a786eb9c5ab4798fe7fadabf60989060b7380616 SHA1 773f137df3e54cc55d210e810e8708538c1c495c SHA256 efef38c0318d156ba3263416355847af961f561660793cb670633e056018beac
+DIST libgda-5.0.0.tar.xz 11620540 RMD160 9fe23239a774f487c30c7cf1af63f8101ed62271 SHA1 fa4d0d7eae7fa7842329fe4af3ff92788a8da6d4 SHA256 b8f14505d8e921b97b20a0ff99e10c611bd57c317b0f081e7f76bc2c87ae1fea
 EBUILD libgda-4.2.7.ebuild 3698 RMD160 c1428640299ed4e22bafd57f0c8fce335e8189e2 SHA1 ce20b471eca4e0caba3fa7d4bbb138d414cb64a8 SHA256 c8b32c4dbb570e306e6332fffdfb2694941ab1847f1081b1943facdace23dee7
 EBUILD libgda-4.2.9.ebuild 3648 RMD160 edb431720b189d9c79d1f9724e60df4e7123c97d SHA1 b9479c66f99f4a8f0b04b7ae5d6227f7688cf3f3 SHA256 5b26ed8e6fc6a23ea2461e17879fd78370cf3e844c0ac60dc3d63d449817a90e
 EBUILD libgda-4.99.4.ebuild 5011 RMD160 b5a5dfd1fdd9ef22e3b2ab7bcf4919a946d0f503 SHA1 a2a16e29cf0c96fbbf88f5e21d29ebd588b3e008 SHA256 72f3955651a40a8061d935f755f91620351315f4f3cbea77eab346a8a22da7fc
-MISC ChangeLog 27537 RMD160 bd927e298623913e44e3ce01bfe72e7e0371c027 SHA1 925bbdf68d4f37c0656a68540ac9bb6170370bb7 SHA256 3eecb96734389b1d8d48144aa954b324b4048acd7f5cba2a450a1a28cdf8b43f
+EBUILD libgda-5.0.0.ebuild 4944 RMD160 b3c738d36c0cb35b2fe7611cff6712619e49e801 SHA1 4f3d4fae94759940cb475edd06e162cc0d4ddbef SHA256 50d85fdce06dc07f7901ee40a4e8851d738c8b782978a7ff36501a8d91dd848c
+MISC ChangeLog 27848 RMD160 53719ab4e15364d75da1d87527fcb8eb29779e0e SHA1 66369167e89fb200b823d56d1254cd0c416f8972 SHA256 579bc8a785217f85cafbe6762a7c056b58d031990a30686f6c9bb4fd0b7c7aa9
 MISC metadata.xml 685 RMD160 947db2a1525c1737c4c183771f55e422a3abc95a SHA1 ba263d5f1851c2295214bb9edc868f77bce0033e SHA256 8482c362762fa4d00ccd08bac5d9fbe2468f055c4fd9a7eb2c9d31a9987cc611
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6hgMwACgkQuUQtlDBCeQLjhQCghadnaizuJD5YdP4RnGTnTkY+
-akQAnRrDGiRg6iGnS7aZcocSDEtkUZIM
-=/hT7
+iF4EAREIAAYFAk6s55gACgkQdjK8w9WeBnAHrgD/V2Mxcr3dctLxv92up2csJJLg
+HomcS99GRQjOCYhRrMkA/2yFo39Tv17zgX3OZ6EueZ1sJIxum4EXPQtnlWOKjjWN
+=Ldln
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-5.0.0.ebuild b/gnome-extra/libgda/libgda-5.0.0.ebuild
new file mode 100644
index 000000000000..5ed4bd5ba299
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.0.0.ebuild
@@ -0,0 +1,166 @@
+# 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.0.ebuild,v 1.1 2011/10/30 05:58:42 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"
+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 )"
+
+# XXX: some tests fail when run from portage (but pass when building by hand)
+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
+
+	# XXX: vala bindings have build problems: https://bugzilla.gnome.org/show_bug.cgi?id=663009
+	G2CONF="${G2CONF}
+		--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_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"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Fix build order for generated content, upstream #630958
+	#epatch "${FILESDIR}/${PN}-9999-fix-build-order.patch"
+
+	# 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}
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_test() {
+	emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
+}
+
+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
+}