Fix deps

Package-Manager: portage-2.1.13.6/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

5 files changed, 15 insertions, 77 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/Manifest b/gnome-extra/gnome-contacts/Manifest
index a6d827cbbdab..351ecdd6b1cb 100644
--- a/gnome-extra/gnome-contacts/Manifest
+++ b/gnome-extra/gnome-contacts/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST gnome-contacts-3.6.2.tar.xz 610024 SHA256 7d1b6a8e395b15bf150062f332348549cf9deb38dfa3aad9994f70e71d8449fa SHA512 0db305697c420ac958273d24e46afa2421d43c34fd31e5d20f95d333092ce6d894abe56208cf312133e4a062d0092b1b5f3dcc2c79c1e431f3439ab9a4b81ca1 WHIRLPOOL 3659e0f0851879b5db38c822acdc000e1aa88e7b146467f70f1d1e350ef7ea93262e0ea7aee58cfcba6422afe758be70748a3439b3e300b541971f582ee68306
-DIST gnome-contacts-3.8.2.tar.xz 711832 SHA256 6cb3fe9e7f0f2380d77494a3408893265c42ea2a70579f0c871defbab5a7b5fa SHA512 d746a5519ddf4ef5ff0d155f2f93541484ff5279d05e7f15a5943479913ec0c029cc4f35d4a1654618b1b925a677856cfdc99597773e00bce2766e185ce9a639 WHIRLPOOL 0fb00277ae462e8d4f55ba1ac1dd206adac4455bf548fac2cf67da67198d3f3187811dfb946f0c63c8b7cc79891554051926685986712a6b638997a7220a0d5e
 DIST gnome-contacts-3.8.3.tar.xz 717164 SHA256 48e179aa40ffdee4218565a22da31d8794fb47f21beda60a2e8b80483a2f80a3 SHA512 5585db467d8f0c68135ffae99a6567d3cfeb5b90b39be98f54d0b11f33a45cae93b27a4df8bf2c3046aa2f609daa4131d9eca39c1fd8ceb1e767a572ab586658 WHIRLPOOL b9457e5f0acadc8a62ac3b3d4a715d46bf19b2aa9889819a154bc389031ab5bd3ff327256f8d8c21d4c635e18d6393c4b588769f529b090aa90672dba2ae59cd
-EBUILD gnome-contacts-3.6.2.ebuild 1571 SHA256 311472d6094f74e1bc2222a7a3b52b8b40139b16c29f42ee0345f230ec6d7d24 SHA512 c735516c5e03b65776fefc4b6c12efa0a3c9331c5ed90c81e0b3cabd137aef6ae4321f223b988ca4b70cb7e6f9b8fd3976d5ae3d6bba1a173163068df0acd9e7 WHIRLPOOL e84da9063aba804d00e3aea06cdb77a237a237589341750405e42d8e510d318e437161e2b967b6924ee7129d3c92cb9db95e4408c3ccf7015818b42ec3e69f86
-EBUILD gnome-contacts-3.8.2.ebuild 1592 SHA256 26dbd7a9ca28ab872948d0ce5767d785c486fcf9558da6795ac65c3877fcf254 SHA512 5f931f482348e1e86267e145daee9c6a098c78820fbf27f158acb5b6dd0bbf89e6f2248a93b9db58a3f954748b6474d928ca4dd90421540e13afcf119e2b31d9 WHIRLPOOL 274bdb8f30ebdbe5a82124e63ebd46740934331951d2e23044e932f4fe12ec5c841e09adc87d9f2e5811971ed8c13de7b144ddcc14ca6d7ddd37ec407f671a7c
-EBUILD gnome-contacts-3.8.3.ebuild 1594 SHA256 eea5015169069b957ed5a3fa119d3e3c593c78275d6393b9a9de0fb055cda7da SHA512 049def71f95c785900bf61daa876a1305ba09d11bc98cabf7ad544e08bc6427f1bded3a1cd5f47905e11021e0c94c02c22f3c5131266da31be4b49ce06dba974 WHIRLPOOL 705306af2db1d473fa324cff162322d9a33074e2235de0b0e30a372c8689ef1d356f131642edf4e63916d98eabeeacda89befd02750c883945a20f01bb33013b
-MISC ChangeLog 3155 SHA256 c18d13b389d4ca46ab7cc58d4b8fbea2737959da4e5352df579ce4b6f7d30947 SHA512 3d67997a84b98f6fcb29794f6541031c173c4e41b1248d05ac66bff87e246816ae7b10d8a9ab302cc49b8af070389f5e1abebf9b85804ca1fca55fd47ddfd34e WHIRLPOOL 56f04103a823981b73d40c0ef44b80314050b9222286105f0949ce6e165966524cb8e57a1d8b859f999904067f734088f6ef8791ed1cfca950a6c626bc555938
+EBUILD gnome-contacts-3.6.2.ebuild 1576 SHA256 41bbea0e7d4cdcb9e81bb1742daa1e5ae9daa21d0c90a0cb221da20a61c4cb4a SHA512 0b87bab97ded00627af64037d5fb6d39df82cf5225587e75df41928bb678e8d2025a3be238f514a13943ca2a657ce4f9f63c1e04fdae730812511529d8677ab3 WHIRLPOOL 7ad8b78b282c236e72c671e3a1cb29e597e8b90c593deeb617e4c31d41578933af83f70ccca59a8b985566aef74bbbd5d1b45c678a552097485724c1514c3f2d
+EBUILD gnome-contacts-3.8.3.ebuild 1597 SHA256 d7da3a20b7c9ba8bed927bd4ee4d77b99ae9b692aebc97497e5ae0616f3c0626 SHA512 118d1163526b03d1e777671dd48027e63a0ad776abbbf68b4296854d7f5e71543ebee45afbddcd714c0ed8c3684f70d9f5d4a8a26449823133ef91f8895de128 WHIRLPOOL 2e1d79b524ad4e8641cc77507cfb013bcfa4982d0769bf67b7efdb1056e50aa8b73dec3a6a9129ddcd5c41078ceb823dfbe42e255e8b89679befe83cadd4550b
+MISC ChangeLog 3303 SHA256 fe8a56dd13f99ac2aff4be44b671d621296356bfa0d96fa92f685dee54c35002 SHA512 f641339a976857813c26353ea437f99e2f6bd5eabea1c4f516b7eb2a82a0c934ee739b11c4508ac8ceb6aafaece182423fc3e51bf2bf659587830abfc11e831b WHIRLPOOL 71b71cec7b8daf7a7a7d96b14ae59e37e694a79e35e243e8d0a55e42c479ecada69f07439eeb19cdc37400fa309aa310a243e4f65c7e4a4cc14304cc98161e14
 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHm+2wACgkQCaWpQKGI+9RVOACfdVQX77VIvb+sHXKr6SaPLBG+
-6OsAn2ehhgMBKibQetmYBW0iZ2GQgVxb
-=LKjZ
+iEYEAREIAAYFAlIE1f8ACgkQCaWpQKGI+9Q0UwCdEE33iCrtkHNECZCtLrpTJ2u7
+WbcAnjO9WKx4HgRzt82WqXGOoxw9sLz7
+=4SNQ
 -----END PGP SIGNATURE-----
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]