[jhbuild] Revert "enchant-2: switch it to a systemmodule"

[Sébastien Wilmet <swilmet src gnome org>]

commit 04e9219adbc62fd845b6156838a19cf261156011
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun Mar 29 19:51:07 2020 +0200

    Revert "enchant-2: switch it to a systemmodule"
    
    This reverts commit 2db213e9c63612f6f3790d94ab43352e9465bef8.
    
    Actually enchant-2 is not yet available on a stable version of Ubuntu.
    It'll be available on Ubuntu 20.04.

 modulesets/gnome-suites-core-deps-latest.modules | 17 +++++++++++++++++
 modulesets/gnome-sysdeps-latest.modules          |  6 ------
 2 files changed, 17 insertions(+), 6 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-latest.modules 
b/modulesets/gnome-suites-core-deps-latest.modules
index 03bb15ee..ad671a59 100644
--- a/modulesets/gnome-suites-core-deps-latest.modules
+++ b/modulesets/gnome-suites-core-deps-latest.modules
@@ -339,6 +339,23 @@
     </dependencies>
   </meson>
 
+  <autotools id="enchant-2"
+             autogen-sh="configure"
+             autogenargs="--with-hunspell --with-hunspell-dir=/usr/share/myspell">
+    <if condition-set="freebsd">
+      <autogenargs value="--with-hunspell-dir=/usr/local/share/hunspell"/>
+    </if>
+    <branch repo="github-tar"
+            version="2.2.6"
+            module="AbiWord/enchant/releases/download/v${version}/enchant-${version}.tar.gz"
+            hash="sha256:8048c5bd26190b21279745cfecd05808c635bc14912e630340cd44a49b87d46d">
+    </branch>
+    <dependencies>
+      <dep package="hunspell"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
   <cmake id="evolution-data-server"
          cmakeargs="-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON -DENABLE_UOA=OFF 
-DENABLE_GOOGLE_AUTH=OFF">
     <if condition-set="freebsd">
diff --git a/modulesets/gnome-sysdeps-latest.modules b/modulesets/gnome-sysdeps-latest.modules
index 6dc50875..5fd09a97 100644
--- a/modulesets/gnome-sysdeps-latest.modules
+++ b/modulesets/gnome-sysdeps-latest.modules
@@ -232,12 +232,6 @@
             version="1.6.0"/>
   </systemmodule>
 
-  <systemmodule id="enchant-2">
-    <pkg-config>enchant-2.pc</pkg-config>
-    <branch repo="system"
-            version="2.2.8"/>
-  </systemmodule>
-
   <systemmodule id="espeak">
     <branch repo="system" version="1.46.02"/>
     <systemdependencies>