[jhbuild] 3.22, 3.24: Revert sysdeps changes made by commit 9928379

[Ting-Wei Lan <lantw src gnome org>]

commit b1444d9d32e9c894d46772e729cb94574b3c9e80
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Mon Sep 26 23:53:13 2016 +0800

    3.22, 3.24: Revert sysdeps changes made by commit 9928379
    
    Commit 9928379 was meant to add modulesets for GNOME 3.24, but it did
    some unexpected modification in sysdeps-3.22.

 modulesets/gnome-sysdeps-3.22.modules |   26 ++++++--------------------
 modulesets/gnome-sysdeps-3.24.modules |   26 ++++++--------------------
 2 files changed, 12 insertions(+), 40 deletions(-)
---
diff --git a/modulesets/gnome-sysdeps-3.22.modules b/modulesets/gnome-sysdeps-3.22.modules
index 2a13e9e..500a6f3 100644
--- a/modulesets/gnome-sysdeps-3.22.modules
+++ b/modulesets/gnome-sysdeps-3.22.modules
@@ -266,20 +266,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="gettext">
-    <branch repo="system" version="0.19"/>
-    <systemdependencies>
-      <dep type="c_include" name="gettext-po.h"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="gettext-bin">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="msgfmt"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="gexiv2">
     <pkg-config>gexiv2.pc</pkg-config>
     <branch repo="system"/>
@@ -399,6 +385,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="kyotocabinet">
+    <branch repo="system"/>
+    <pkg-config>kyotocabinet.pc</pkg-config>
+  </systemmodule>
+
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
@@ -551,7 +542,7 @@
 
   <systemmodule id="libarchive">
     <pkg-config>libarchive.pc</pkg-config>
-    <branch repo="system" version="2.8.0"/>
+    <branch repo="system" version="3.1.0"/>
   </systemmodule>
 
   <systemmodule id="libcap">
@@ -665,11 +656,6 @@
             version="0.9.4"/>
   </systemmodule>
 
-  <systemmodule id="libpinyin">
-    <pkg-config>libpinyin.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libpng">
     <pkg-config>libpng.pc</pkg-config>
     <branch repo="system"/>
diff --git a/modulesets/gnome-sysdeps-3.24.modules b/modulesets/gnome-sysdeps-3.24.modules
index 2a13e9e..500a6f3 100644
--- a/modulesets/gnome-sysdeps-3.24.modules
+++ b/modulesets/gnome-sysdeps-3.24.modules
@@ -266,20 +266,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="gettext">
-    <branch repo="system" version="0.19"/>
-    <systemdependencies>
-      <dep type="c_include" name="gettext-po.h"/>
-    </systemdependencies>
-  </systemmodule>
-
-  <systemmodule id="gettext-bin">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="path" name="msgfmt"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="gexiv2">
     <pkg-config>gexiv2.pc</pkg-config>
     <branch repo="system"/>
@@ -399,6 +385,11 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="kyotocabinet">
+    <branch repo="system"/>
+    <pkg-config>kyotocabinet.pc</pkg-config>
+  </systemmodule>
+
   <systemmodule id="lcms2">
     <pkg-config>lcms2.pc</pkg-config>
     <branch repo="system"
@@ -551,7 +542,7 @@
 
   <systemmodule id="libarchive">
     <pkg-config>libarchive.pc</pkg-config>
-    <branch repo="system" version="2.8.0"/>
+    <branch repo="system" version="3.1.0"/>
   </systemmodule>
 
   <systemmodule id="libcap">
@@ -665,11 +656,6 @@
             version="0.9.4"/>
   </systemmodule>
 
-  <systemmodule id="libpinyin">
-    <pkg-config>libpinyin.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libpng">
     <pkg-config>libpng.pc</pkg-config>
     <branch repo="system"/>