[jhbuild] 3.12: Move gnutls to -sysdeps

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

commit 4dfd767d0bfb7a88fa88887c8197bb6c569ebd39
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Feb 11 13:10:25 2014 +0000

    3.12: Move gnutls to -sysdeps
    
    This was moved in a8ba59d9b4a973bb20cad64ebc958b95033fe6de, but
    glib-networking doesnt depend on gnutls 3.x anymore

 modulesets/gnome-suites-core-deps-3.12.modules |   14 --------------
 modulesets/gnome-sysdeps-3.12.modules          |   11 ++++++-----
 2 files changed, 6 insertions(+), 19 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.12.modules b/modulesets/gnome-suites-core-deps-3.12.modules
index 8528a23..1c2088e 100644
--- a/modulesets/gnome-suites-core-deps-3.12.modules
+++ b/modulesets/gnome-suites-core-deps-3.12.modules
@@ -522,20 +522,6 @@
     </suggests>
   </autotools>
 
-  <autotools id="gnutls">
-    <pkg-config>gnutls.pc</pkg-config>
-    <branch module="gnutls/gnutls-${version}.tar.xz"
-            version="3.0.26"
-            repo="ftp.gnu.org"
-            hash="sha256:a80b55fd9b2fc7c5c7bca4f9fac2caff17880412849823e314393a905bd50ed3">
-    </branch>
-    <dependencies>
-      <dep package="libnettle" />
-      <dep package="libtasn1" />
-      <dep package="p11-kit" />
-    </dependencies>
-  </autotools>
-
   <autotools id="grilo">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-sysdeps-3.12.modules b/modulesets/gnome-sysdeps-3.12.modules
index 2e18a4e..58a1ac7 100644
--- a/modulesets/gnome-sysdeps-3.12.modules
+++ b/modulesets/gnome-sysdeps-3.12.modules
@@ -210,6 +210,12 @@
             version="2.6.6"/>
   </systemmodule>
 
+  <systemmodule id="gnutls">
+    <pkg-config>gnutls.pc</pkg-config>
+    <branch repo="system"
+            version="2.12.8"/>
+  </systemmodule>
+
   <systemmodule id="gpgme">
     <branch repo="system"
             version="1.0.0"/>
@@ -446,11 +452,6 @@
     </systemdependencies>
   </systemmodule>
 
-  <systemmodule id="libnettle">
-    <pkg-config>nettle.pc</pkg-config>
-    <branch repo="system"/>
-  </systemmodule>
-
   <systemmodule id="libnl">
     <pkg-config>libnl-3.0.pc</pkg-config>
     <branch repo="system"