Fix dependencies. Depend on gst-1 only to avoid automagic.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 21 insertions, 18 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 3ed5d4923161..5735b49d5078 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.399 2013/07/23 20:56:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.400 2013/07/28 08:31:59 eva Exp $
+
+  28 Jul 2013; Gilles Dartiguelongue <eva@gentoo.org> evolution-3.6.4.ebuild,
+  evolution-3.8.4.ebuild:
+  Fix dependencies. Depend on gst-1 only to avoid automagic.
 
 *evolution-3.8.4 (23 Jul 2013)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 943aeef66fd0..0806c70d26e1 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -15,15 +15,15 @@ DIST evolution-3.6.4.tar.xz 12401324 SHA256 7bf7054d85b7d1bd0e62d69f15ef80dbe781
 DIST evolution-3.8.3.tar.xz 12322284 SHA256 b0ee1eae5f4752eeb0b62c3be2daa08195ab4fd19092bfe6e75d02ac457ebe3a SHA512 97a6a3229bf1c3f08ec66f164dc90ca4550b25090c66f13da79452884c4eb63943cd45fd443c1cf6cd727329a5230b010be75c643a5a5a0d8bcd3b9c125308f2 WHIRLPOOL 0bf24497db13de28f27aa3364b34878d62e8346424d6bc45a992e952ccb0d6642b8577df9cce41877bc8aee42453472f7d0c17dd24ded2799c0698a1a9cd4dc4
 DIST evolution-3.8.4.tar.xz 12324844 SHA256 d5cfd0cb68ed8bf6e9515a5a44f566e3d26d3813a22ee6e5b0f86029039b1766 SHA512 3d074ad1678067a673ff715090b9543c4a108ff571d28c08e10936d4572648327dc1d6cd5d0eb10133202a589e407e8e9c535247921c699792899ceabeaa678b WHIRLPOOL 15cad220f5a130ff1a95c10492b07c3aec82f82c9f5948b9e8b8f8593496aa17e46bd505641d002a1611d16d2c575cb959c1776c91d7b9896cea536489251598
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
-EBUILD evolution-3.6.4.ebuild 4771 SHA256 c5851e8b3f8dd190a8399a2b46bb3208ecda459cc9a491ac30e8c0f5cfcb3e63 SHA512 6195b02c98d4facd7ebd694ba7f0357420bccbea4318f41fc2adbf83f5da8bce0e6060d03a40a9444d7b5f5098d1f92a8d4575157c8398843909b26805739454 WHIRLPOOL b146041019c285cfc0d631ad05d4d29941a6d4b8833b784d4365554958f7fcba78d8003d8da724878ac26c3bdbeba7e2272a90f5f50ddade2ba87c214898825a
+EBUILD evolution-3.6.4.ebuild 4808 SHA256 e837f9e98a03f439e51ac8008556162b1afa08ae4e3721e038b8b42843bf24ac SHA512 14261f40501d3bce54c619dba3312ffa06f3bf7c84ace06e6b76952349bf999596eb40f9260e0523c25f92a238c4547c641de04aa150496b081186a756cde55c WHIRLPOOL 51e1750f0f18bf0de00264965724c3f483e7bedb2c24b2bb2d64777341391eaab2213bf8d8898c9910bb9bcb34d58f3c2fe37f6c1210e98a3769fe87c03733cc
 EBUILD evolution-3.8.3.ebuild 4554 SHA256 7e6d3ef720fc08bcc518733397637246baf3ed7f6ff5ffdb47e8b26d6a358db8 SHA512 bb1059c3b7c7b007f09985809c3a052262cb1b5b5029023d7abfc1ac15a170a9f48506f01f08f4c5ac2c63eb03f1fe7e5ab381b34256f162057f99dd01b5f0cd WHIRLPOOL 0e84d9727087cc43b80def471834393c4ca127c3682ae6ef6300f322abe799194221166bc040c69694f7ed81d2cc8ab965cfd532d1789d28e8d1c5440148e649
-EBUILD evolution-3.8.4.ebuild 4568 SHA256 4df0f91fb303027064e28060edb37a4ebd535d49018ef98040f28d83e35130a3 SHA512 abf89dd1f6c19b92e43e31e8cd5cab4ca4b1455dfa27aed6c39a4f650cc534fbad2eb4ce78d42cc30a11b2d4b4b5d93bbbf97cb386ad17fa12cc6d7b15fa795c WHIRLPOOL cbd895780a19fc96b4168b606e0a0811eebd524608063e30482aba229841b67b6ba73325bc185083ba00b4b9b077f31b4f5b8de41f1b53239f5810e504b0588c
-MISC ChangeLog 88681 SHA256 94096704232292ee111e6055d6fe76de41e813829912761a7f7caeb3a1b51662 SHA512 f07062fbdfd5d0141dedd6ab6c7bb8ab2bb4585146e641844bc67a9aeff67cda116feb6026ce332822169c50c09090f133819061c0a75398fbc15ba749778f7c WHIRLPOOL 6201d9793ccf56ffd330f0868f2a974d0e416e43c66baa2aef7a2a0c9aef67e29ec7bb883627523f8bfc09330047a94378ed7f89097680a8cdbd6effab602070
+EBUILD evolution-3.8.4.ebuild 4486 SHA256 a57bfe6897a1538d38242f66ee54ca0e077ab4e15340a3cf2817ef108722f861 SHA512 0645c94920ce88391f5ff075ae0cd6c026d21604ca7791e8ce2268fbd08b7cfade8e59505d610ef827e0e83e096182999d8b5126bbd6024d6fa04398488c25d1 WHIRLPOOL d0fccd96a4ed0d4f8153255f370752dca788e687bfe8d929249eb7538d457ebc2a747266554098a6c298d56ffe70cea12caa78c9800fcbad66963b3d79f4a928
+MISC ChangeLog 88845 SHA256 51b2c035dadb4891bea18384431eb9cbbdca9de10651735473870c83e78b3e3c SHA512 a6a42b71d2ab5cdfd0eb7c5f0f0af16a1edffb0a267daa2e3875b37f37691221ab062119fbb8f40818284a6cd0cfa7e9b335a65deefdd340fe74b144b7bb1223 WHIRLPOOL b3818ce41766a70d77f507b67efbd01b46a93082bf51a3f663847a633f469a3a41b0ea80b691a118372f188f1e0f8d914ff64f99beb8d93000ee63056bf8afc3
 MISC metadata.xml 1273 SHA256 57d501a14b07828c2c839e5fe5c97f7bcf765e507b2d1a264c104eab4819215f SHA512 856175453a5f7c376c687ed229ff0dcc9c2dd840d3b6f5c1617f58d227fdfeabe944dcc8229d2fc1fa32f698337368fe1d3e76fe6d7c841d4fe68a5afbe8db8c WHIRLPOOL ef128b4d25b0e2b02cfd76105409e60ca2fa0ca89ccf1c08f088e202dcc1b780452b70c6e7e5363b8157eef39785285945c796de99a09d4547c5a13ba7d9c36d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHu7hoACgkQCaWpQKGI+9RstQCcCqnyzGRfAVHUr6iMJUstSPj1
-aCAAniYFLPa8CNZxaX+sQSWhQpnNNU1z
-=QVwx
+iEYEAREIAAYFAlH01wAACgkQ1fmVwcYIWAaVjQCfUq+xt4QdCwX44osdp5mJ7G2L
+j9IAoMSfjzVfWA49US+kCmgdgzVhvd7C
+=cR7t
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.6.4.ebuild b/mail-client/evolution/evolution-3.6.4.ebuild
index a0573fe988c9..b8ae06026b43 100644
--- a/mail-client/evolution/evolution-3.6.4.ebuild
+++ b/mail-client/evolution/evolution-3.6.4.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/mail-client/evolution/evolution-3.6.4.ebuild,v 1.2 2013/04/11 19:14:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.6.4.ebuild,v 1.3 2013/07/28 08:31:59 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -39,7 +39,9 @@ COMMON_DEPEND="
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.38.1:2.4
+	|| (
+		>=net-libs/libsoup-2.42:2.4
+		>=net-libs/libsoup-gnome-2.38.1:2.4 )
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=
diff --git a/mail-client/evolution/evolution-3.8.4.ebuild b/mail-client/evolution/evolution-3.8.4.ebuild
index 6a9c3b4b9468..330155723c04 100644
--- a/mail-client/evolution/evolution-3.8.4.ebuild
+++ b/mail-client/evolution/evolution-3.8.4.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/mail-client/evolution/evolution-3.8.4.ebuild,v 1.1 2013/07/23 20:56:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.8.4.ebuild,v 1.2 2013/07/28 08:31:59 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -40,7 +40,7 @@ COMMON_DEPEND="
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-1.10.0
+	>=net-libs/webkit-gtk-1.10.0:3
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -50,18 +50,15 @@ COMMON_DEPEND="
 		=app-crypt/gnupg-1.4* ) )
 	map? (
 		>=app-misc/geoclue-0.12.0
-		>=media-libs/libchamplain-0.12:0.12
+		>=media-libs/libchamplain-0.12:0.12[gtk]
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
 		>=sci-geosciences/geocode-glib-0.99.0
 		x11-libs/mx:1.0 )
 	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
-	gstreamer? ( || (
-		 ( media-libs/gstreamer:1.0
-		   media-libs/gst-plugins-base:1.0 )
-		 ( media-libs/gstreamer:0.10
-		   media-libs/gst-plugins-base:0.10 )
-	) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0 )
 	kerberos? ( virtual/krb5:= )
 	ldap? ( >=net-nds/openldap-2:= )
 	ssl? (