[gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-contacts/

[Alexandre Rostovtsev]

commit:     1ad82ff3c456135ae4b7ee0dc9e0f672a13a23ad
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  1 03:55:05 2012 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Oct  1 03:55:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1ad82ff3

gnome-extra/gnome-contacts: 3.5.92 → 3.6.0 and fix build (#436732)

Add missing dependencies on vala bindings when USE=-v4l. Thanks to
Raphael Berlamont for reporting.

---
 ...s-3.5.92.ebuild => gnome-contacts-3.6.0.ebuild} |   13 ++++++++-----
 .../gnome-contacts/gnome-contacts-9999.ebuild      |   13 ++++++++-----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.6.0.ebuild
similarity index 85%
rename from gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild
rename to gnome-extra/gnome-contacts/gnome-contacts-3.6.0.ebuild
index 7bfeb5a..fa4bc76 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.6.0.ebuild
@@ -23,7 +23,11 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 VALA_DEPEND="$(vala_depend)
-	net-libs/telepathy-glib[vala]"
+	dev-libs/folks[vala]
+	gnome-base/gnome-desktop[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+	x11-libs/libnotify[introspection]"
 # Configure is wrong; it needs cheese-3.5.91, not 3.3.91
 RDEPEND="
 	>=dev-libs/glib-2.31.10:2
@@ -55,10 +59,7 @@ fi
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS" # README is empty
-	# We do not need valac when building from pre-generated C sources,
-	# but configure checks for it anyway
 	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-$(vala_best_api_version))
 		$(use_with v4l cheese)"
 	# FIXME: Fails to compile with USE=-v4l
 }
@@ -68,6 +69,8 @@ src_prepare() {
 	if ! use v4l; then
 		touch src/*.vala
 	fi
-	# We don't want vala_src_prepare
+	if [[ ${PV} = 9999 ]] || ! use v4l; then
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
index 7bfeb5a..fa4bc76 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
@@ -23,7 +23,11 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 VALA_DEPEND="$(vala_depend)
-	net-libs/telepathy-glib[vala]"
+	dev-libs/folks[vala]
+	gnome-base/gnome-desktop[introspection]
+	gnome-extra/evolution-data-server[vala]
+	net-libs/telepathy-glib[vala]
+	x11-libs/libnotify[introspection]"
 # Configure is wrong; it needs cheese-3.5.91, not 3.3.91
 RDEPEND="
 	>=dev-libs/glib-2.31.10:2
@@ -55,10 +59,7 @@ fi
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog NEWS" # README is empty
-	# We do not need valac when building from pre-generated C sources,
-	# but configure checks for it anyway
 	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-$(vala_best_api_version))
 		$(use_with v4l cheese)"
 	# FIXME: Fails to compile with USE=-v4l
 }
@@ -68,6 +69,8 @@ src_prepare() {
 	if ! use v4l; then
 		touch src/*.vala
 	fi
-	# We don't want vala_src_prepare
+	if [[ ${PV} = 9999 ]] || ! use v4l; then
+		vala_src_prepare
+	fi
 	gnome2_src_prepare
 }