[jhbuild] 3.8: Use libgcrypt from distro packages

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

commit 22e1019f5d82309b92ba5e3348ab6462e2821ea1
Author: Javier JardÃn <jjardon gnome org>
Date:   Tue Dec 11 03:47:24 2012 +0900

    3.8: Use libgcrypt from distro packages

 modulesets/gnome-suites-core-deps-base-3.8.modules |   21 --------------------
 modulesets/gnome-sysdeps-3.8.modules               |    8 +++++++
 2 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index af47aef..721086d 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -15,8 +15,6 @@
       href="https://launchpad.net/"/>
 <repository type="tarball" name="gnome.org"
     href="http://download.gnome.org/sources/"/>
-<repository type="tarball" name="gnupg.org"
-    href="ftp://ftp.gnupg.org/gcrypt/"/>
 <repository type="tarball" name="xmlsoft.org"
     href="ftp://xmlsoft.org/"/>
 <repository type="tarball" name="sourceforge.net"
@@ -102,25 +100,6 @@
     </after>
   </autotools>
 
-  <autotools id="libgpg-error" autogen-sh="configure" check-target="false">
-    <branch module="libgpg-error/libgpg-error-1.8.tar.bz2"
-            repo="gnupg.org" version="1.8"
-            hash="sha256:bdfbf2677147239d2d26d4e37f44635d9fd97c133c9ef9fd9793a12a059508c5"
-            size="435341" />
-  </autotools>
-
-  <autotools id="libgcrypt" autogen-sh="configure" check-target="false">
-    <branch repo="gnupg.org"
-            module="libgcrypt/libgcrypt-1.5.0.tar.bz2"
-            version="1.5.0"
-            hash="sha256:4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa"
-            size="1433506">
-    </branch>
-    <dependencies>
-      <dep package="libgpg-error" />
-    </dependencies>
-  </autotools>
-
   <!-- with-libusb=no will result in libgphoto2 using the newer libusb-1.0 -->
   <autotools id="libgphoto2"
              autogen-sh="configure" autogenargs="--with-libusb=no">
diff --git a/modulesets/gnome-sysdeps-3.8.modules b/modulesets/gnome-sysdeps-3.8.modules
index 1b74f2f..ac9eb6c 100644
--- a/modulesets/gnome-sysdeps-3.8.modules
+++ b/modulesets/gnome-sysdeps-3.8.modules
@@ -272,6 +272,14 @@
     <branch repo="system" version="2.8.0"/>
   </systemmodule>
 
+  <systemmodule id="libgcrypt">
+    <branch repo="system"
+            version="1.5.0"/>
+    <systemdependencies>
+      <dep type="c_include" name="gcrypt.h"/>
+    </systemdependencies>
+  </systemmodule>
+
   <systemmodule id="liboauth">
     <pkg-config>oauth.pc</pkg-config>
     <branch repo="system"