[jhbuild] 3.20: Move itstool to -sysdeps

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 3a74683a83347b6fd708257b2a94b7c9f76b2737
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Oct 23 20:21:23 2015 +0100

    3.20: Move itstool to -sysdeps

 modulesets/gnome-suites-core-deps-3.20.modules |   16 ----------------
 modulesets/gnome-sysdeps-3.20.modules          |   14 +++++++-------
 2 files changed, 7 insertions(+), 23 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.20.modules b/modulesets/gnome-suites-core-deps-3.20.modules
index 392c798..0bdf4cb 100644
--- a/modulesets/gnome-suites-core-deps-3.20.modules
+++ b/modulesets/gnome-suites-core-deps-3.20.modules
@@ -42,8 +42,6 @@
     href="http://icon-theme.freedesktop.org/releases/"/>
 <repository type="tarball" name="nice.freedesktop.org"
     href="http://nice.freedesktop.org/releases/"/>
-<repository type="tarball" name="itstool.org"
-    href="http://files.itstool.org/itstool/"/>
 <repository type="tarball" name="libpwquality"
     href="https://fedorahosted.org/releases/l/i/libpwquality/"/>
 <repository type="tarball" name="ftp.mozilla.org"
@@ -880,20 +878,6 @@
     </dependencies>
   </autotools>
 
-  <!-- Remove annoying autogen-sh="autoreconf" when itstool.use-correct-libxml.patch is removed -->
-  <autotools id="itstool" autogen-sh="autoreconf">
-    <branch repo="itstool.org"
-            module="itstool-2.0.2.tar.bz2"
-            version="2.0.2"
-            hash="sha256:bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a"
-            size="96748">
-      <patch file="itstool.use-correct-libxml.patch" strip="1"/>
-    </branch>
-    <dependencies>
-      <dep package="libxml2-python"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="java-gnome" autogen-sh="configure" skip-autogen="never">
     <branch repo="research.operationaldynamics.com"
             module="bzr/java-gnome/mainline"/>
diff --git a/modulesets/gnome-sysdeps-3.20.modules b/modulesets/gnome-sysdeps-3.20.modules
index fdaf2a6..1ab8788 100644
--- a/modulesets/gnome-sysdeps-3.20.modules
+++ b/modulesets/gnome-sysdeps-3.20.modules
@@ -347,6 +347,13 @@
     </systemdependencies>
   </systemmodule>
 
+  <systemmodule id="itstool">
+    <branch repo="system"/>
+    <systemdependencies>
+      <dep type="path" name="itstool"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="json">
     <pkg-config>json-c.pc</pkg-config>
     <branch repo="system"
@@ -753,13 +760,6 @@
             version="2.7.8"/>
   </systemmodule>
 
-  <systemmodule id="libxml2-python">
-    <branch repo="system"/>
-    <systemdependencies>
-      <dep type="python2" name="libxml2"/>
-    </systemdependencies>
-  </systemmodule>
-
   <systemmodule id="libxslt">
     <pkg-config>libxslt.pc</pkg-config>
     <branch repo="system"