diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2013-07-28 08:31:59 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-07-28 08:31:59 +0000 |
| commit | 9ffec5f04c715aaca5b6362c193588c537364116 (patch) | |
| tree | 62bbd8e796f91204925a0acd1fda2844ef8a2d28 /mail-client | |
| parent | Add more precise glib/gtk+ dependency. (diff) | |
| download | gentoo-2-9ffec5f04c715aaca5b6362c193588c537364116.tar.gz gentoo-2-9ffec5f04c715aaca5b6362c193588c537364116.tar.bz2 gentoo-2-9ffec5f04c715aaca5b6362c193588c537364116.zip | |
Fix dependencies. Depend on gst-1 only to avoid automagic.
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'mail-client')
| -rw-r--r-- | mail-client/evolution/ChangeLog | 6 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-3.6.4.ebuild | 6 | ||||
| -rw-r--r-- | mail-client/evolution/evolution-3.8.4.ebuild | 15 |
3 files changed, 15 insertions, 12 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/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? ( |