Fix build with multiple python installation, bug #315323. Add support for vala bindings needed for gnome 2.32.

Package-Manager: portage-2.2_rc89/cvs/Linux x86_64

4 files changed, 45 insertions, 11 deletions

diff --git a/net-libs/telepathy-glib/ChangeLog b/net-libs/telepathy-glib/ChangeLog
index 4d5e9318168f..a813ce213df9 100644
--- a/net-libs/telepathy-glib/ChangeLog
+++ b/net-libs/telepathy-glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/telepathy-glib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.53 2010/10/09 15:21:46 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.54 2010/10/13 21:49:50 eva Exp $
+
+  13 Oct 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  telepathy-glib-0.12.0.ebuild, metadata.xml:
+  Fix build with multiple python installation, bug #315323. Add support for
+  vala bindings needed for gnome 2.32.
 
   09 Oct 2010; Samuli Suominen <ssuominen@gentoo.org>
   telepathy-glib-0.10.1.ebuild:
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index 3037ed02b427..3d479398e709 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST telepathy-glib-0.10.1.tar.gz 2070833 RMD160 217cdafd42eda2c2f42b5ff92dba2b828f947477 SHA1 5f49d6de4c23bf035c4028751a4e0f2a4adf8136 SHA256 56a3eeb5a7d0925cf0600961c2fd664ee929f5e66a4642c8977cffd87567bac4
 DIST telepathy-glib-0.10.7.tar.gz 2090298 RMD160 6c1791d4d2b7aaa3de9f58392e9e772dfe5261bf SHA1 95f4f16bb882bb37c857dac4f811da00bf26395c SHA256 92b0de059ff3bcec08d16fe31456aecd8fe8f5973504e1ac45b28fed8b41307a
 DIST telepathy-glib-0.12.0.tar.gz 2549491 RMD160 93a76b69db709422e0772fe239b15ba9d59d474a SHA1 76270f4cfb84bae4668d531d16dd6afc77acbbc2 SHA256 46199c9a2c00a181d9c897ecab22b2becd44dc2fe9f25c816a32f97e83724b70
 EBUILD telepathy-glib-0.10.1.ebuild 1058 RMD160 fb806781e3dd50438e483fb9b7f13dfaa45d2416 SHA1 6737b8f0f4b08298ba6ae6c42f6616a7967fe7b9 SHA256 67c18312a794de80541f1c73cd3ab0ff0e8719ae87e02f49a4599f0167a145b8
 EBUILD telepathy-glib-0.10.7.ebuild 1060 RMD160 546721cf53b8a1513108109b3b0bbdd1c05b7332 SHA1 327d82dc8bb71017dee34d06746081601c3e5135 SHA256 d92e7201b6fc6a044bee3ff14a035993bb1bc654b01f7ac69e70e513dc00ed70
-EBUILD telepathy-glib-0.12.0.ebuild 1249 RMD160 c7489b4e82ad9fe982ee100fee4c73da00d4237c SHA1 6cc0ab1c59529ebbdb040fd03662d9d0eb63b93a SHA256 f14fc4a05c9926513720bc168456cfcc052327d1dd41563610a1f4aead6d2d00
-MISC ChangeLog 8414 RMD160 46dc1d2cb57d52dfa0b04cf6948ea789900838fc SHA1 2a8d9559dc812d3f45aecae6c1656ce1c7478226 SHA256 a1ed064ff207b2d7413261b000cf74971a0d5247f9932ed8974e5ffc43f08b24
-MISC metadata.xml 422 RMD160 685b1cc704a07b4d0fd0884564e6e6faf6d53fc9 SHA1 55e1737b6a9d3f08a9282dd4978290e119f4b02f SHA256 1bc5db7c676ba2ddbc0bbdaf595cd0c89f0b90c43cc02154507a09ff3aba2316
+EBUILD telepathy-glib-0.12.0.ebuild 1523 RMD160 ed860c867a366dc30bcae853f85ad29453b51f87 SHA1 03a938779435514c167b98b33bdd5a1280d022c6 SHA256 ef7dc274e37342dab8c85427a777e707fa18169f6b028ed2ac6233f0de833f0c
+MISC ChangeLog 8624 RMD160 98cb5929e86f05e6669c5494a68151c80d5752f5 SHA1 275daab9c148c547f358c10dd98734c6605f5b9e SHA256 e95e625ae1954ddc6b40cb7c4a1a5c7288f7359798a58ae680c12edfcfaae247
+MISC metadata.xml 494 RMD160 c560f4ce2945828800b9c9f6af09fef5f4ad09a3 SHA1 b97d8d2a5f4d3a900ec263413f1d83d6d31e38b6 SHA256 b1e79912c6395ca4ec15f04b41ef84747963f82de9f7d9824394f8278385395a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAky2KYQACgkQ1fmVwcYIWAYDGgCgqTVxUm9BT1A272SiNIgorR0b
+hOIAnRFiwNVpn/C0tqJ+SBUTCvSwGH4J
+=AU5z
+-----END PGP SIGNATURE-----
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
index f8f82209b104..0a84fc951f34 100644
--- a/net-libs/telepathy-glib/metadata.xml
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -11,6 +11,7 @@
 	<use>
 		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
 		for introspection</flag>
+		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 	</use>
 </pkgmetadata>
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild
index 73be431a4bb1..e1222974d8b9 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild
@@ -1,8 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild,v 1.2 2010/10/06 21:01:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild,v 1.3 2010/10/13 21:49:50 eva Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2:2.5"
+
+inherit python
 
 DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -11,25 +14,40 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug +introspection"
+IUSE="debug +introspection vala"
 
 RDEPEND=">=dev-libs/glib-2.24
 	>=dev-libs/dbus-glib-0.82
-	>=dev-lang/python-2.5
-	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )"
-
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
+	vala? (
+		dev-lang/vala:0.10[vapigen]
+		>=dev-libs/gobject-introspection-0.9.6 )
+"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/pkgconfig-0.21"
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_configure() {
-	# configure help says vala-bindings are experimental
+	local myconf
+
+	if use vala; then
+		myconf="--enable-introspection
+			VALAC=$(type -p valac-0.10)
+			VAPIGEN=$(type -p vapigen-0.10)"
+	fi
+
 	econf \
 		$(use_enable debug) \
 		$(use_enable debug backtrace) \
 		$(use_enable debug handle-leak-debug) \
 		$(use_enable introspection) \
-		--disable-vala-bindings
+		$(use_enable vala vala-bindings) \
+		${myconf}
 }
 
 src_test() {