Disable building vala bindings for now due to https://bugzilla.gnome.org/show_bug.cgi?id=668701

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

4 files changed, 31 insertions, 13 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 5e7fb0612318..d670be4e7fc4 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,11 @@
 # 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.191 2012/01/25 11:01:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.192 2012/01/26 01:06:31 tetromino Exp $
+
+  26 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org> libgda-5.0.3.ebuild,
+  +files/libgda-5.0.3-custom.vala:
+  Disable building vala bindings for now due to
+  https://bugzilla.gnome.org/show_bug.cgi?id=668701
 
 *libgda-5.0.3 (25 Jan 2012)
 
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 6902dd53c807..254fbabbf33e 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
@@ -8,6 +8,7 @@ AUX libgda-4.99.1-gda-browser-doc-collision.patch 1847 RMD160 b103d8a8eb0e44318a
 AUX libgda-4.99.1-gda-browser-help-collision.patch 1270 RMD160 e7675db0e35b98d4f94b22b204b806c9938051c1 SHA1 1ba6f0587f82a66f7062cc48fff05b024b8bdc4d SHA256 b9d20506fe89fd0219f3d737450bbba0a98e5b850cf152e570ca8a6a66740994
 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
+AUX libgda-5.0.3-custom.vala 171 RMD160 7a04594991e9ad6e0218448877bfcda8ee4600f4 SHA1 d5bdf7438b422b863a1ac83e0df311e8d50d4ff9 SHA256 28be89b84fdb22a38d7c0d9bb65e6d1a8ebfc3aa16eff424e26bdcfe95e2d0bf
 DIST libgda-4.2.11.tar.xz 11253296 RMD160 4dc6d0ed9edaa479e937183eeab74a18e7e9518b SHA1 f655b894b4d339018b80dbb8468ebe671f898501 SHA256 2359ccea3870de1c0162689b225a2546f2f883d7c12d29a0885828cd3f5fe575
 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
@@ -17,13 +18,13 @@ EBUILD libgda-4.2.11.ebuild 3261 RMD160 8d3b2821034cb23ff6f958116a54b78b0964e22d
 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
-EBUILD libgda-5.0.3.ebuild 4413 RMD160 9b1dbb05748182819a3b9bf06a87dc72adfc1773 SHA1 40522fbb4b7575dec9f352c8be818454076f8eec SHA256 aca297c86ca7dc6886f67cf03de3390721b009a3796cfdcf2dfd1c59f05c59c3
-MISC ChangeLog 29472 RMD160 cb112484fcddc31af5c48c09ac5852822cf02cbe SHA1 239a6d7cbd29f4562e1de2de2f967307a5d7d93f SHA256 19e89f4462052df3e003918d9f3023bbde6b4d448ec9a952c39fecbbd0e5ae06
+EBUILD libgda-5.0.3.ebuild 4650 RMD160 100c183996327688c931012cddfb3d6360a3a025 SHA1 576a30f627a882222bee0d792bd82309bcf085c6 SHA256 e41704260c3638ce3ba0011ae9cae700616aa1184eafc17d84e8c9e452134907
+MISC ChangeLog 29692 RMD160 c2ea2957ec93320513f1d6be4daae23bfeae08e1 SHA1 97ae51d2fffd49ee19adbb810c930aab69a8e3fa SHA256 2f395560846f242cea9f09750574db68a52ad838dfd9d804ddf493f3f5533e4b
 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)
 
-iEYEARECAAYFAk8f4P0ACgkQCaWpQKGI+9TTZwCdFhMnr/FA8QYqteO/2rgKKzeB
-UAYAnRnnBQDVyuUauoBAc+nA+2eCXrvt
-=0bR7
+iF4EAREIAAYFAk8gpx0ACgkQdjK8w9WeBnDToAEAiLm8GfZAaKWeNbD/SAnt1U4P
+HwTCP2VSIUApq6e1atAA/386pxskEVL7EHuxC7zyrogF31nYLFKde3Yk+zLKFpxc
+=J0Ii
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-5.0.3-custom.vala b/gnome-extra/libgda/files/libgda-5.0.3-custom.vala
new file mode 100644
index 000000000000..d464a8f9cc06
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.0.3-custom.vala
@@ -0,0 +1,6 @@
+namespace Gda {
+	public class DataProxy : GLib.Object, Gda.DataModel {
+		[CCode (cname="gda_data_proxy_new")]
+		public static GLib.Object @new (Gda.DataModel model);
+	}
+}
diff --git a/gnome-extra/libgda/libgda-5.0.3.ebuild b/gnome-extra/libgda/libgda-5.0.3.ebuild
index 7aa88a18fdb8..258a50bfcfcf 100644
--- a/gnome-extra/libgda/libgda-5.0.3.ebuild
+++ b/gnome-extra/libgda/libgda-5.0.3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.3.ebuild,v 1.2 2012/01/26 01:06:31 tetromino Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -13,7 +13,7 @@ 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"
+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"
 
@@ -47,8 +47,8 @@ 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] )"
+	doc? ( >=dev-util/gtk-doc-1 )"
+#	vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS README"
@@ -82,7 +82,10 @@ pkg_setup() {
 		$(use_with mysql mysql /usr)
 		$(use_with postgres postgres /usr)
 		$(use_enable ssl crypto)
-		$(use_enable vala)"
+		--disable-vala
+		VAPIGEN=$(type -P vapigen-0.14)"
+#		$(use_enable vala)
+	# Disable vala due to https://bugzilla.gnome.org/show_bug.cgi?id=668701
 
 	if use bindist; then
 		# firebird license is not GPL compatible
@@ -129,6 +132,9 @@ src_prepare() {
 
 	python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
 
+	# Missing from tarball
+	cp "${FILESDIR}/libgda-${PV}-custom.vala" libgda/libgda-5.0-custom.vala || die
+
 	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 	gnome2_src_prepare