Version bump for Gnome 3.10

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

2 files changed, 30 insertions, 19 deletions

diff --git a/gnome-extra/gnome-contacts/ChangeLog b/gnome-extra/gnome-contacts/ChangeLog
index b662eeec7697..bf12a053f799 100644
--- a/gnome-extra/gnome-contacts/ChangeLog
+++ b/gnome-extra/gnome-contacts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-contacts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.23 2013/12/08 18:46:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.24 2013/12/24 16:51:07 pacho Exp $
+
+*gnome-contacts-3.10.1 (24 Dec 2013)
+
+  24 Dec 2013; Pacho Ramos <pacho@gentoo.org> +gnome-contacts-3.10.1.ebuild,
+  -gnome-contacts-3.6.2.ebuild:
+  Version bump for Gnome 3.10
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gnome-contacts-3.8.3.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild
index d8bda9b96113..95b9bcbf92b2 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild
@@ -1,33 +1,36 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild,v 1.9 2013/08/09 11:43:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.10.1.ebuild,v 1.1 2013/12/24 16:51:07 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
+VALA_MIN_API_VERSION="0.22"
+VALA_USE_DEPEND="vapigen"
 
 inherit gnome2 vala
 
 DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://live.gnome.org/Design/Apps/Contacts"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
 
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="v4l"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-VALA_DEPEND="$(vala_depend)
+VALA_DEPEND="
+	$(vala_depend)
+	>=dev-libs/gobject-introspection-0.9.6
 	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/folks-0.9.5:=[eds,telepathy]
+	>=dev-libs/glib-2.37.6:2
+	>=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
@@ -35,26 +38,28 @@ RDEPEND="
 	x11-libs/cairo:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/libnotify:=
-	>=x11-libs/gtk+-3.4:3
+	>=x11-libs/gtk+-3.9.11:3
 	x11-libs/pango
 	v4l? ( >=media-video/cheese-3.5.91:= )
 "
 DEPEND="${RDEPEND}
+	${VALA_DEPEND}
+	dev-libs/libxslt
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
-	!v4l? ( ${VALA_DEPEND} )"
-# When !v4l, we regenerate the .c sources
+"
 
 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
-		vala_src_prepare
 	fi
+
+	vala_src_prepare
 	gnome2_src_prepare
 }
+
+src_configure() {
+	gnome2_src_configure $(use_with v4l cheese)
+}