From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0CC25138247 for ; Sat, 16 Nov 2013 14:54:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2AE4FE0984; Sat, 16 Nov 2013 14:53:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9EB25E0984 for ; Sat, 16 Nov 2013 14:53:58 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FB0633F150 for ; Sat, 16 Nov 2013 14:53:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C8C45E54C1 for ; Sat, 16 Nov 2013 14:53:54 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1384617702.bbfc6acfaec2c9502153ebe4ee3007cb7b877400.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: mail-client/evolution/ X-VCS-Repository: proj/gnome X-VCS-Files: mail-client/evolution/evolution-3.10.2.ebuild mail-client/evolution/evolution-9999.ebuild X-VCS-Directories: mail-client/evolution/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: bbfc6acfaec2c9502153ebe4ee3007cb7b877400 X-VCS-Branch: master Date: Sat, 16 Nov 2013 14:53:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e0db01c0-b994-4583-840b-ccdd9a43ee97 X-Archives-Hash: 23c08882fa67a3a9a5014c9fa153c448 commit: bbfc6acfaec2c9502153ebe4ee3007cb7b877400 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Nov 16 14:21:51 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Nov 16 16:01:42 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bbfc6acf mail-client/evolution: sync with gentoo-x86 --- mail-client/evolution/evolution-3.10.2.ebuild | 31 ++++++++++++--------------- mail-client/evolution/evolution-9999.ebuild | 29 +++++++++++-------------- 2 files changed, 27 insertions(+), 33 deletions(-) diff --git a/mail-client/evolution/evolution-3.10.2.ebuild b/mail-client/evolution/evolution-3.10.2.ebuild index a702bd9..a5f72c1 100644 --- a/mail-client/evolution/evolution-3.10.2.ebuild +++ b/mail-client/evolution/evolution-3.10.2.ebuild @@ -6,7 +6,7 @@ EAPI="5" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" -inherit autotools eutils flag-o-matic readme.gentoo gnome2 +inherit eutils flag-o-matic readme.gentoo gnome2 #autotools if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -22,7 +22,7 @@ if [[ ${PV} = 9999 ]]; then IUSE="${IUSE} doc" KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi # We need a graphical pinentry frontend to be able to ask for the GPG @@ -32,11 +32,10 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi # glade-3 support is for maintainers only per configure.ac # pst is not mature enough and changes API/ABI frequently COMMON_DEPEND=" - >=app-crypt/gcr-3.4 - >=dev-libs/glib-2.36:2 + >=dev-libs/glib-2.34:2 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gtk+-3.4.0:3 - >=x11-libs/gdk-pixbuf-2.24 + >=x11-libs/gdk-pixbuf-2.24:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=media-libs/libcanberra-0.25[gtk3] @@ -46,11 +45,11 @@ COMMON_DEPEND=" dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 - || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 ) + >=net-libs/libsoup-gnome-2.40.3:2.4 >=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-2.0.1 + >=net-libs/webkit-gtk-2.0.1:3 x11-libs/libSM x11-libs/libICE @@ -60,17 +59,14 @@ 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-3.10.0 x11-libs/mx:1.0 ) - 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? ( @@ -91,7 +87,7 @@ RDEPEND="${COMMON_DEPEND} bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) - !=app-crypt/gcr-3.4 >=dev-libs/glib-2.36:2 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gtk+-3.4.0:3 - >=x11-libs/gdk-pixbuf-2.24 + >=x11-libs/gdk-pixbuf-2.24:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=media-libs/libcanberra-0.25[gtk3] @@ -46,11 +45,11 @@ COMMON_DEPEND=" dev-libs/atk >=dev-libs/dbus-glib-0.6 >=dev-libs/libxml2-2.7.3:2 - || ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 ) + >=net-libs/libsoup-gnome-2.40.3:2.4 >=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-2.0.1 + >=net-libs/webkit-gtk-2.0.1:3 x11-libs/libSM x11-libs/libICE @@ -60,17 +59,14 @@ 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-3.10.0 x11-libs/mx:1.0 ) - 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? ( @@ -91,7 +87,7 @@ RDEPEND="${COMMON_DEPEND} bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) - !