[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/

[Priit Laes]

commit:     dcba6e95d92ce4dc676900530e6095adf317231c
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Jun 23 10:13:25 2014 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Mon Jun 23 10:13:25 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dcba6e95

mail-client/evolution: Add 3.13.3

---
 ...ution-3.12.1.ebuild => evolution-3.13.3.ebuild} | 32 ++++++++++++----------
 mail-client/evolution/evolution-9999.ebuild        | 30 +++++++++++---------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/mail-client/evolution/evolution-3.12.1.ebuild b/mail-client/evolution/evolution-3.13.3.ebuild
similarity index 93%
rename from mail-client/evolution/evolution-3.12.1.ebuild
rename to mail-client/evolution/evolution-3.13.3.ebuild
index 7d7f0d0..6872d19 100644
--- a/mail-client/evolution/evolution-3.12.1.ebuild
+++ b/mail-client/evolution/evolution-3.13.3.ebuild
@@ -31,32 +31,33 @@ 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
+# google tasks requires >=libgdata-0.15.1
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.4
+	>=app-text/enchant-1.1.7
+	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.8.0:3
-	>=x11-libs/gdk-pixbuf-2.24:2
+	>=dev-libs/libgdata-0.10:=
+	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
 	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
+	>=media-libs/libcanberra-0.25[gtk3]
 	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.2.0:3
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.8.0:3
+	>=x11-libs/libnotify-0.7:=
 	>=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:3
 
+	app-text/iso-codes
+	dev-libs/atk
 	x11-libs/libSM
 	x11-libs/libICE
 
 	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		( >=app-crypt/gnupg-2.0.1-r2 x11-libs/libcryptui ${PINENTRY_DEPEND} )
 		=app-crypt/gnupg-1.4* ) )
 	map? (
 		>=app-misc/geoclue-0.12.0:0
@@ -121,15 +122,16 @@ src_prepare() {
 
 src_configure() {
 	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
 	local myconf
 	[[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--without-glade-catalog \
-		--disable-image-inline \
+		--disable-code-coverage \
+		--disable-installed-tests \
 		--disable-pst-import \
 		--enable-canberra \
 		$(use_enable bogofilter) \
+		$(use_enable crypt libcryptui) \
 		$(use_enable highlight text-highlight) \
 		$(use_enable map contact-maps) \
 		$(use_enable spamassassin) \

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 7d7f0d0..8f4cb5c 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -31,32 +31,35 @@ 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
+# google tasks requires >=libgdata-0.15.1
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.4
+	>=app-text/enchant-1.1.7
+	>=dev-libs/dbus-glib-0.6
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gtk+-3.8.0:3
 	>=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]
-	>=x11-libs/libnotify-0.7:=
 	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
+	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
+	>=net-libs/libsoup-2.42:2.4
+	>=net-libs/webkit-gtk-2.2.0:3
+	>=x11-libs/cairo-1.9.15:=[glib]
+	>=x11-libs/gdk-pixbuf-2.24:2
+	>=x11-libs/gtk+-3.8.0:3
 	>=net-libs/libsoup-2.42: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:3
 
+	app-text/iso-codes
+	dev-libs/atk
 	x11-libs/libSM
 	x11-libs/libICE
 
 	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
+		( >=app-crypt/gnupg-2.0.1-r2 x11-libs/libcryptui ${PINENTRY_DEPEND} )
 		=app-crypt/gnupg-1.4* ) )
 	map? (
 		>=app-misc/geoclue-0.12.0:0
@@ -121,15 +124,16 @@ src_prepare() {
 
 src_configure() {
 	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
 	local myconf
 	[[ ${PV} != 9999 ]] && myconf="${myconf} ITSTOOL=$(type -P true)"
 	gnome2_src_configure \
 		--without-glade-catalog \
-		--disable-image-inline \
+		--disable-code-coverage \
+		--disable-installed-tests \
 		--disable-pst-import \
 		--enable-canberra \
 		$(use_enable bogofilter) \
+		$(use_enable crypt libcryptui) \
 		$(use_enable highlight text-highlight) \
 		$(use_enable map contact-maps) \
 		$(use_enable spamassassin) \