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

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     cb8e812be603c6e59ad0ed48afda35bcddd849e5
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 23:38:35 2012 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 00:08:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cb8e812b

gnome-extra/gnome-contacts: 3.5.91 → 3.5.92

---
 ...-3.5.91.ebuild => gnome-contacts-3.5.92.ebuild} |   32 ++++++++++++------
 .../gnome-contacts/gnome-contacts-9999.ebuild      |   33 +++++++++++++------
 2 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild
similarity index 68%
rename from gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild
rename to gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild
index 6f7c8de..7bfeb5a 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.5.91.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.5.92.ebuild
@@ -4,8 +4,9 @@
 
 EAPI="4"
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
 
-inherit autotools eutils gnome2
+inherit gnome2 vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -21,7 +22,9 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-
+VALA_DEPEND="$(vala_depend)
+	net-libs/telepathy-glib[vala]"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
 RDEPEND="
 	>=dev-libs/glib-2.31.10:2
 	>=x11-libs/gtk+-3.4:3
@@ -30,10 +33,7 @@ RDEPEND="
 	>=net-libs/telepathy-glib-0.17.5
 	>=dev-libs/folks-0.7.2[eds]
 
-	v4l? (
-		media-libs/gstreamer
-		media-libs/gst-plugins-base 
-		>=media-video/cheese-3.3.5 )
+	v4l? ( >=media-video/cheese-3.5.91 )
 
 	dev-libs/libgee:0
 	net-libs/gnome-online-accounts
@@ -44,12 +44,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	!v4l? ( ${VALA_DEPEND} )"
+# When !v4l, we regenerate the .c sources
 
 if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		>=dev-lang/vala-0.17.2:0.18
-		net-libs/telepathy-glib[vala]"
+	DEPEND+="
+		${VALA_DEPEND}"
 fi
 
 pkg_setup() {
@@ -57,7 +58,16 @@ pkg_setup() {
 	# We do not need valac when building from pre-generated C sources,
 	# but configure checks for it anyway
 	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-0.18)
+		VALAC=$(type -P valac-$(vala_best_api_version))
 		$(use_with v4l cheese)"
 	# FIXME: Fails to compile with USE=-v4l
 }
+
+src_prepare() {
+	# Regenerate the pre-generated C sources
+	if ! use v4l; then
+		touch src/*.vala
+	fi
+	# We don't want vala_src_prepare
+	gnome2_src_prepare
+}

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
index 326f5c3..7bfeb5a 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
@@ -4,8 +4,9 @@
 
 EAPI="4"
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.18"
 
-inherit autotools eutils gnome2
+inherit gnome2 vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -21,7 +22,9 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-
+VALA_DEPEND="$(vala_depend)
+	net-libs/telepathy-glib[vala]"
+# Configure is wrong; it needs cheese-3.5.91, not 3.3.91
 RDEPEND="
 	>=dev-libs/glib-2.31.10:2
 	>=x11-libs/gtk+-3.4:3
@@ -30,10 +33,7 @@ RDEPEND="
 	>=net-libs/telepathy-glib-0.17.5
 	>=dev-libs/folks-0.7.2[eds]
 
-	v4l? (
-		media-libs/gstreamer
-		media-libs/gst-plugins-base 
-		>=media-video/cheese-3.3.5 )
+	v4l? ( >=media-video/cheese-3.5.91 )
 
 	dev-libs/libgee:0
 	net-libs/gnome-online-accounts
@@ -44,12 +44,13 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	!v4l? ( ${VALA_DEPEND} )"
+# When !v4l, we regenerate the .c sources
 
 if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		>=dev-lang/vala-0.17.2:0.18
-		net-libs/telepathy-glib[vala]"
+	DEPEND+="
+		${VALA_DEPEND}"
 fi
 
 pkg_setup() {
@@ -57,6 +58,16 @@ pkg_setup() {
 	# We do not need valac when building from pre-generated C sources,
 	# but configure checks for it anyway
 	G2CONF="${G2CONF}
-		VALAC=$(type -P valac-0.18)
+		VALAC=$(type -P valac-$(vala_best_api_version))
 		$(use_with v4l cheese)"
+	# FIXME: Fails to compile with USE=-v4l
+}
+
+src_prepare() {
+	# Regenerate the pre-generated C sources
+	if ! use v4l; then
+		touch src/*.vala
+	fi
+	# We don't want vala_src_prepare
+	gnome2_src_prepare
 }