Fix deps

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

4 files changed, 9 insertions, 69 deletions

diff --git a/gnome-extra/gnome-contacts/ChangeLog b/gnome-extra/gnome-contacts/ChangeLog
index dc1b90f68eb3..98ca311fa615 100644
--- a/gnome-extra/gnome-contacts/ChangeLog
+++ b/gnome-extra/gnome-contacts/ChangeLog
@@ -1,6 +1,10 @@
 # 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.20 2013/07/17 20:15:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/ChangeLog,v 1.21 2013/08/09 11:43:58 pacho Exp $
+
+  09 Aug 2013; Pacho Ramos <pacho@gentoo.org> -gnome-contacts-3.8.2.ebuild,
+  gnome-contacts-3.6.2.ebuild, gnome-contacts-3.8.3.ebuild:
+  Fix deps
 
 *gnome-contacts-3.8.3 (17 Jul 2013)
 
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild
index c19beca45b88..d8bda9b96113 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2013/02/02 22:37:19 ago Exp $
+# $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 $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -17,7 +17,7 @@ IUSE="v4l"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 VALA_DEPEND="$(vala_depend)
-	dev-libs/folks[vala]
+	dev-libs/folks[vala(+)]
 	gnome-base/gnome-desktop[introspection]
 	gnome-extra/evolution-data-server[vala]
 	net-libs/telepathy-glib[vala]
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild
deleted file mode 100644
index 76c62f20d4f6..000000000000
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.8.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.8.2.ebuild,v 1.3 2013/06/30 21:30:09 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.18"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="GNOME contact management application"
-HOMEPAGE="https://live.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)
-	>=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]
-"
-# 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.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
-	>=net-libs/telepathy-glib-0.17.5
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libnotify:=
-	>=x11-libs/gtk+-3.7.10:3
-	x11-libs/pango
-	v4l? ( >=media-video/cheese-3.5.91:= )
-"
-DEPEND="${RDEPEND}
-	${VALA_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Regenerate the pre-generated C sources, bug #471628
-	if ! use v4l; then
-		touch src/*.vala
-	fi
-
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_with v4l cheese)
-}
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.8.3.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.8.3.ebuild
index 89956a541515..69c8a4b3e913 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.8.3.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.8.3.ebuild
@@ -1,6 +1,6 @@
 # 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.8.3.ebuild,v 1.1 2013/07/17 20:15:40 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-contacts/gnome-contacts-3.8.3.ebuild,v 1.2 2013/08/09 11:43:58 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 VALA_DEPEND="
 	$(vala_depend)
 	>=dev-libs/gobject-introspection-0.9.6
-	dev-libs/folks[vala]
+	dev-libs/folks[vala(+)]
 	gnome-base/gnome-desktop[introspection]
 	gnome-extra/evolution-data-server[vala]
 	net-libs/telepathy-glib[vala]