Version bump.

Package-Manager: portage-2.1.10.36/cvs/Linux x86_64

3 files changed, 168 insertions, 7 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 514297dabf3b..12badbdc8403 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,11 @@
 # 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.186 2011/11/16 18:38:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.187 2011/11/21 11:57:46 pacho Exp $
+
+*libgda-5.0.2 (21 Nov 2011)
+
+  21 Nov 2011; Pacho Ramos <pacho@gentoo.org> +libgda-5.0.2.ebuild:
+  Version bump.
 
 *libgda-5.0.1 (16 Nov 2011)
 *libgda-4.2.11 (16 Nov 2011)
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index ab30be41d7af..9eb000526de7 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
@@ -13,17 +13,19 @@ DIST libgda-4.2.11.tar.xz 11253296 RMD160 4dc6d0ed9edaa479e937183eeab74a18e7e951
 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
+DIST libgda-5.0.2.tar.xz 11596872 RMD160 e537451442d9ce2653ab5a07ac1875241c8af4eb SHA1 cba9fd7f734782e021801e05214a89bf4b752a33 SHA256 53e710a76298a224546803ecee711e610c68cf6938bd908e6d7e3c9bab183593
 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
 EBUILD libgda-5.0.1.ebuild 4738 RMD160 d962b2e400150b5b048867a8b0bc3360b54db044 SHA1 bbc3e822c3bb798ac50915aec845908302fb7741 SHA256 a24b0a3c63ce8aa5360622b0b99cedd261587fdaa3d092d00dc65ac6add01a19
-MISC ChangeLog 28706 RMD160 2cb93e3d149d37a797a9870a5be465874af4910c SHA1 ebbd2be89985b9da26468edfc87de382d21a8630 SHA256 46be64dd50d57c4acd7d12642acd93090f8205fad4d21ffad046f00921c2f1ce
+EBUILD libgda-5.0.2.ebuild 4489 RMD160 0e0e8a0b9db0dd7ac7e605c10e6150733981d2cb SHA1 8b6f32614c27f734b8d79d9d02036178571f143c SHA256 050ceca950fddb29c43d826d7f6f07fbcd9286a9a4ab0640585348fc764118ec
+MISC ChangeLog 28816 RMD160 7e3e6600796bc6d83261422d87722fdb189705d3 SHA1 15532781a39a8602d92917b7662f8f1f07fab05b SHA256 2e91eb90c248161e6636ede51b42a2513b45e3049c2d75ac6b3ed8d8f90ef2e5
 MISC metadata.xml 755 RMD160 6913b2cf330e2b6658b4ab8f56125861d9ab8452 SHA1 754844884f251071ca33075bbf999db5c7b67698 SHA256 d9518a1c92b5c3840f451010f0c4d34780f102e1f16debdc705f5f463416e811
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk7EA0AACgkQdjK8w9WeBnBavAD+P1lloUGiivzvvStFOabJwXRa
-rra0sapoQIsC9S6mdeQBAJvAz+SYBSiuxSr4uQb8bS4AosSAhOhr927Fj2rl33qu
-=2Hpy
+iEYEARECAAYFAk7KPMAACgkQCaWpQKGI+9SR6wCeL6Vqk2rwn+GVCqlN9k5SGj6n
+f0AAn1LJnXf7A+QC0Z8GqnVxjUFRYLA4
+=v/LU
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-5.0.2.ebuild b/gnome-extra/libgda/libgda-5.0.2.ebuild
new file mode 100644
index 000000000000..fb34695fb466
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.0.2.ebuild
@@ -0,0 +1,154 @@
+# 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.2.ebuild,v 1.1 2011/11/21 11:57:46 pacho 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"
+
+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"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Disable broken tests so we can check the others, upstream bug #????
+	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, upstream bug #664462
+	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
+}