Version bump, also stop applying patch to skip tests as they pass for me (if you are able to reproduce the failures, please file a bug to investigate the issue).

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

3 files changed, 165 insertions, 5 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index e5b20e5ec596..5e7fb0612318 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.190 2012/01/14 17:10:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.191 2012/01/25 11:01:11 pacho Exp $
+
+*libgda-5.0.3 (25 Jan 2012)
+
+  25 Jan 2012; Pacho Ramos <pacho@gentoo.org> +libgda-5.0.3.ebuild:
+  Version bump, also stop applying patch to skip tests as they pass for me (if
+  you are able to reproduce the failures, please file a bug to investigate the
+  issue).
 
   14 Jan 2012; Markus Meier <maekke@gentoo.org> libgda-4.2.11.ebuild:
   x86 stable, bug #393007
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 5f8fc96ea59f..6902dd53c807 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -12,16 +12,18 @@ DIST libgda-4.2.11.tar.xz 11253296 RMD160 4dc6d0ed9edaa479e937183eeab74a18e7e951
 DIST libgda-4.2.12.tar.xz 11238088 RMD160 e15139cec3b843ca4d927482850de6b4527e676b SHA1 a7fb768ddb58742dbe102c112eb44bb08fafd708 SHA256 636c17d0a7380d77eb89c19426dc62580f900a86b9dd93cb0b03210ff77769f9
 DIST libgda-4.2.9.tar.xz 11215344 RMD160 fd172c5aac8ed76b97b9c66f0558c79ad373d3d1 SHA1 57205e2ec041f8138a85b7b5e5728dc0f1266fb6 SHA256 bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814
 DIST libgda-5.0.2.tar.xz 11596872 RMD160 e537451442d9ce2653ab5a07ac1875241c8af4eb SHA1 cba9fd7f734782e021801e05214a89bf4b752a33 SHA256 53e710a76298a224546803ecee711e610c68cf6938bd908e6d7e3c9bab183593
+DIST libgda-5.0.3.tar.xz 11623340 RMD160 b72781633aec2f139ce6fe1d34006513cd58f7ef SHA1 151159134f4083e86a3b556fd80c48376e584290 SHA256 82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc
 EBUILD libgda-4.2.11.ebuild 3261 RMD160 8d3b2821034cb23ff6f958116a54b78b0964e22d SHA1 3d7eb47fcb36c5efc62c13eeb459db1f98b0fd9d SHA256 fdb1beca3dd01a0a8cd07d5afe57347bd5978cd3fa4f179ab2d0a214e06b8709
 EBUILD libgda-4.2.12.ebuild 3225 RMD160 ca98c6669c9784bd98e367a3e299fa44000a90b4 SHA1 364211c3b1af6c3eedc0fa2a7c75cb3a7377ce36 SHA256 0163b95c4f011e6d9e68714c0460a39affebdac9b3b8ded85678a27cd55b9029
 EBUILD libgda-4.2.9.ebuild 3642 RMD160 67a1f3fe5aeba77e75a83f5064d47fab0e163d20 SHA1 51d3188c997bb5ba63de3d5af6ea3c32727e80a1 SHA256 8527ca86de488a0ae5efafab87c1a0acb04b7938ef2275085e2990ae20f9b6d6
 EBUILD libgda-5.0.2.ebuild 4489 RMD160 0e0e8a0b9db0dd7ac7e605c10e6150733981d2cb SHA1 8b6f32614c27f734b8d79d9d02036178571f143c SHA256 050ceca950fddb29c43d826d7f6f07fbcd9286a9a4ab0640585348fc764118ec
-MISC ChangeLog 29207 RMD160 64e3ca90334ed720dd25f99ee31a66ef48ff50a0 SHA1 4bbb020f01f31773262962217fa90944ee9f6407 SHA256 3ae70a17ffaae59f19f0be4b39a1299bdaf79aa94e0cfdcd04ffca0f54bef918
+EBUILD libgda-5.0.3.ebuild 4413 RMD160 9b1dbb05748182819a3b9bf06a87dc72adfc1773 SHA1 40522fbb4b7575dec9f352c8be818454076f8eec SHA256 aca297c86ca7dc6886f67cf03de3390721b009a3796cfdcf2dfd1c59f05c59c3
+MISC ChangeLog 29472 RMD160 cb112484fcddc31af5c48c09ac5852822cf02cbe SHA1 239a6d7cbd29f4562e1de2de2f967307a5d7d93f SHA256 19e89f4462052df3e003918d9f3023bbde6b4d448ec9a952c39fecbbd0e5ae06
 MISC metadata.xml 755 RMD160 6913b2cf330e2b6658b4ab8f56125861d9ab8452 SHA1 754844884f251071ca33075bbf999db5c7b67698 SHA256 d9518a1c92b5c3840f451010f0c4d34780f102e1f16debdc705f5f463416e811
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk8Rt4EACgkQkKaRLQcq0GLXwACfZjQEWnYsGdhoyb4QiE8c8PAJ
-hEAAn1AOHXgH9e2IIzub/WGkLpju0zsr
-=nRMg
+iEYEARECAAYFAk8f4P0ACgkQCaWpQKGI+9TTZwCdFhMnr/FA8QYqteO/2rgKKzeB
+UAYAnRnnBQDVyuUauoBAc+nA+2eCXrvt
+=0bR7
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/libgda-5.0.3.ebuild b/gnome-extra/libgda/libgda-5.0.3.ebuild
new file mode 100644
index 000000000000..7aa88a18fdb8
--- /dev/null
+++ b/gnome-extra/libgda/libgda-5.0.3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3.ebuild,v 1.1 2012/01/25 11:01:11 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}
+
+	intltoolize --force --copy --automake || die "intltoolize 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
+}