mail-client/evolution: 3.9.92 → 3.10.2

9999 has also been bumped to current git deps

3 files changed, 11 insertions, 13 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 0aa37e94..e58de30e 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1 +1 @@
-DIST evolution-3.9.92.tar.xz 12460084 SHA256 8b5f47d531fc3e1d2f9bbcbd911c0b4081140fe1e6dfe141de155a428e51b581 SHA512 8d1581e5c97c1ecbd8a8ca731369034c85741d953c4feaad3a2befd8037a1bc826543d2f19f1e034ed123884ed52c5d34cd3a0d034422d249d1b41b19c2a24da WHIRLPOOL 50feb611a4917ecb6eab30e7b097176357611c704bb162dc9bf7e220eacb2460bc02ee27fb0249da4845250b208c914f1f9b447e54d588436ebbd49e9c60c6ec
+DIST evolution-3.10.2.tar.xz 12401196 SHA256 39d228460b0f6701d9786ebd98d8ed4d87ecf8a73c12e00d41f7b107d27b7c47 SHA512 affccdcf2085efdf100d9a9e6121bc2a6bf9a4758ad9baa8254930b322a31faca20d409905151be5811df3ac07b6c5be359aa3fe0562217a0714ae1e08b70f46 WHIRLPOOL 84190f237e7ed9849f1b32ab74faa2839c18abd9d88893330765ce0c2e844bcdd92fd50e5fc3c4695d22f91ac7268728ba0514f587c5e615887e97cd5de953f2
diff --git a/mail-client/evolution/evolution-3.9.92.ebuild b/mail-client/evolution/evolution-3.10.2.ebuild
index 987fdb2b..a702bd9f 100644
--- a/mail-client/evolution/evolution-3.9.92.ebuild
+++ b/mail-client/evolution/evolution-3.10.2.ebuild
@@ -6,11 +6,10 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils flag-o-matic readme.gentoo gnome2 versionator
+inherit autotools eutils flag-o-matic readme.gentoo gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
-MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
@@ -33,7 +32,8 @@ 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="
-	>=dev-libs/glib-2.34:2
+	>=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
@@ -42,7 +42,6 @@ COMMON_DEPEND="
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7:=
 	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
-	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
@@ -51,7 +50,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-2.0.1
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -64,7 +63,7 @@ COMMON_DEPEND="
 		>=media-libs/libchamplain-0.12:0.12
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-0.99.0
+		>=sci-geosciences/geocode-glib-3.10.0
 		x11-libs/mx:1.0 )
 	gstreamer? ( || (
 		 ( media-libs/gstreamer:1.0
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 987fdb2b..a702bd9f 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -6,11 +6,10 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils flag-o-matic readme.gentoo gnome2 versionator
+inherit autotools eutils flag-o-matic readme.gentoo gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
-MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
 HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
@@ -33,7 +32,8 @@ 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="
-	>=dev-libs/glib-2.34:2
+	>=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
@@ -42,7 +42,6 @@ COMMON_DEPEND="
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7:=
 	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
-	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
@@ -51,7 +50,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-2.0.1
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -64,7 +63,7 @@ COMMON_DEPEND="
 		>=media-libs/libchamplain-0.12:0.12
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-0.99.0
+		>=sci-geosciences/geocode-glib-3.10.0
 		x11-libs/mx:1.0 )
 	gstreamer? ( || (
 		 ( media-libs/gstreamer:1.0