mail-client/geary: ensure a single enchant version mapped at runtime

Raise dependencies further to ensure all libraries used also use enchant:2,
so we don't get both libenchant.so and libenchant-2.so mapped in at runtime,
with each having mostly the same symbol names.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio@gentoo.org>

diff --git a/mail-client/geary/geary-3.34.2-r2.ebuild b/mail-client/geary/geary-3.34.2-r3.ebuild
similarity index 93%
rename from mail-client/geary/geary-3.34.2-r2.ebuild
rename to mail-client/geary/geary-3.34.2-r3.ebuild
index 3d83e66a39b89e45b3fec5fb39ebcc834eb4e6aa..dc4d077d3cdbd91768a5ae7c2397b2b4045e8b0c 100644 (file)
--- a/mail-client/geary/geary-3.34.2-r2.ebuild
+++ b/mail-client/geary/geary-3.34.2-r3.ebuild
@@ -19,13 +19,14 @@ KEYWORDS="~amd64 ~x86"
 # for now both enchants work, but ensuring enchant:2
 # FIXME: add valadoc support
 
-# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it.
+# >=webkit-gtk-2.26.3-r1 and >=gspell-1.7 dep to ensure all libraries used use enchant:2
+# >=webkit-gtk-2.26 dep to ensure HAS_WEBKIT_SHARED_PROC is handled for it;
 # If not, it could be compiled against 2.24 and then webkit-gtk upgraded and
 # geary not rebuilt, ending up in geary issues #558 and #559 still.
 DEPEND="
        >=dev-libs/glib-2.54:2
        >=x11-libs/gtk+-3.24.7:3
-       >=net-libs/webkit-gtk-2.26:4=
+       >=net-libs/webkit-gtk-2.26.3-r1:4=
        >=dev-libs/gmime-2.6.17:2.6
        >=dev-db/sqlite-3.12:3
 
@@ -35,7 +36,7 @@ DEPEND="
        >=app-crypt/gcr-3.10.1:0=
        >=dev-libs/libgee-0.8.5:0.8=
        net-libs/gnome-online-accounts
-       app-text/gspell:=
+       >=app-text/gspell-1.7:=
        app-text/iso-codes
        >=dev-libs/json-glib-1.0
        >=media-libs/libcanberra-0.28