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

[Alexandre Rostovtsev]

commit:     7a0c074d337968786865ec20a8f1f067765e2618
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 02:30:09 2013 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 02:36:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7a0c074d

gnome-extra/gnome-contacts: use git submodules (#471762) and sync ebuild with gx86

Thanks to Robin Kauffman for noticing that libgd submodule is needed.

---
 .../gnome-contacts/gnome-contacts-9999.ebuild      | 38 ++++++++++------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
index 4230881..76a7d7c 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -19,21 +19,23 @@ SLOT="0"
 IUSE="v4l"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
+	EGIT_HAS_SUBMODULES=true
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
-VALA_DEPEND="$(vala_depend)
+VALA_DEPEND="
+	$(vala_depend)
 	dev-libs/folks[vala]
 	gnome-base/gnome-desktop[introspection]
 	gnome-extra/evolution-data-server[vala]
 	net-libs/telepathy-glib[vala]
-	x11-libs/libnotify[introspection]"
-
+	x11-libs/libnotify[introspection]
+"
 # Configure is wrong; it needs cheese-3.5.91, not 3.3.91
 RDEPEND="
 	>=dev-libs/folks-0.7.3:=[eds,telepathy]
 	>=dev-libs/glib-2.31.10:2
-	dev-libs/libgee:0
+	>=dev-libs/libgee-0.10:0.8
 	>=gnome-extra/evolution-data-server-3.5.3:=[gnome-online-accounts]
 	>=gnome-base/gnome-desktop-3.0:3=
 	net-libs/gnome-online-accounts
@@ -46,28 +48,22 @@ RDEPEND="
 	v4l? ( >=media-video/cheese-3.5.91:= )
 "
 DEPEND="${RDEPEND}
+	${VALA_DEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	!v4l? ( ${VALA_DEPEND} )"
-# When !v4l, we regenerate the .c sources
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND+="
-		${VALA_DEPEND}"
-fi
+"
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		$(use_with v4l cheese)"
-	# FIXME: Fails to compile with USE=-v4l
-
-	# Regenerate the pre-generated C sources
+	# Regenerate the pre-generated C sources, bug #471628
 	if ! use v4l; then
 		touch src/*.vala
 	fi
-	if [[ ${PV} = 9999 ]] || ! use v4l; then
-		vala_src_prepare
-	fi
+
 	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure $(use_with v4l cheese)
 }