[jhbuild] 3.16: Move p11-kit to -sysdeps

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

commit 060ebdf6c92c1a86370142234cee1669ed1429ab
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Oct 22 22:23:52 2014 +0100

    3.16: Move p11-kit to -sysdeps

 modulesets/gnome-suites-core-deps-3.16.modules |   13 -------------
 modulesets/gnome-sysdeps-3.16.modules          |    6 ++++++
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index 9a3bdef..56cc1ee 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -44,8 +44,6 @@
     href="http://nice.freedesktop.org/releases/"/>
 <repository type="tarball" name="poppler.freedesktop.org"
     href="http://poppler.freedesktop.org/"/>
-<repository type="tarball" name="p11-glue.freedesktop.org"
-    href="http://p11-glue.freedesktop.org/releases/"/>
 <repository type="tarball" name="itstool.org"
     href="http://files.itstool.org/itstool/"/>
 <repository type="tarball" name="libpwquality"
@@ -1080,17 +1078,6 @@
     <branch/>
   </autotools>
 
-  <autotools id="p11-kit" supports-non-srcdir-builds="no">
-    <if condition-set="freebsd">
-      <autogenargs value="--with-trust-paths=/usr/local/share/certs/ca-root-nss.crt"/>
-    </if>
-    <branch repo="p11-glue.freedesktop.org"
-            module="p11-kit-0.20.3.tar.gz"
-            version="0.20.3"
-            hash="sha256:b77032bc68c24e6c3cfd8cb340a4a3bb8b7d62a7c659dae08e9b6bb7287193c3"
-            size="1171155" />
-  </autotools>
-
   <autotools id="poppler" autogenargs="--enable-xpdf-headers --enable-poppler-glib" 
makeargs="POPPLER_GLIB_DISABLE_DEPRECATED=">
     <if condition-set="freebsd">
       <autogenargs value="CXXFLAGS=-std=c++11"/>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index a4c05e9..6cd2423 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -678,6 +678,12 @@
     <branch repo="system"/>
   </systemmodule>
 
+  <systemmodule id="p11-kit">
+    <pkg-config>p11-kit-1.pc</pkg-config>
+    <branch repo="system"
+            version="0.20.3"/>
+  </systemmodule>
+
   <systemmodule id="pam">
     <branch repo="system"/>
     <systemdependencies>