[jhbuild/desrt/master: 19/26] sysdeps: correctly handle systemd

[Ryan Lortie <desrt src gnome org>]

commit 59e14e1751cba6ea9d51d6f74b948704d343e57e
Author: Ryan Lortie <desrt desrt ca>
Date:   Sat Jan 3 00:55:18 2015 -0500

    sysdeps: correctly handle systemd
    
    Add the various libsystemd .pc files available, since various pieces of
    software depend on different parts of it.
    
    Correctly mark the dependencies based on what is mentioned in
    configure.ac.  Even if a dependency is optional, if we have the
    'systemd' condition set we treat it as hard.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=742269

 modulesets/gnome-suites-core-3.16.modules      |   42 ++++++++++++++++++++++++
 modulesets/gnome-suites-core-deps-3.16.modules |    9 +++++
 modulesets/gnome-sysdeps-3.16.modules          |   13 ++++++-
 3 files changed, 62 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-3.16.modules b/modulesets/gnome-suites-core-3.16.modules
index 3ef7ced..91eaab3 100644
--- a/modulesets/gnome-suites-core-3.16.modules
+++ b/modulesets/gnome-suites-core-3.16.modules
@@ -237,6 +237,9 @@
       <if condition-set="linux">
         <dep package="gudev"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
     </suggests>
   </autotools>
 
@@ -252,6 +255,11 @@
       <dep package="libXcomposite"/>
       <dep package="sm"/>
       <dep package="xtrans"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -327,6 +335,9 @@
         <dep package="NetworkManager"/>
         <dep package="network-manager-applet"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-journal"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="gstreamer"/>
@@ -367,6 +378,10 @@
       <if condition-set="linux">
         <dep package="udisks"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="libgphoto2"/>
@@ -481,6 +496,12 @@
         <dep package="libudev"/>
         <dep package="sbc"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -901,6 +922,9 @@
       <dep package="glib"/>
       <dep package="gobject-introspection"/>
       <dep package="polkit-gobject"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -939,6 +963,11 @@
       <if condition-set="linux">
         <dep package="plymouth"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-login"/>
+        <dep package="libsystemd-journal"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="upower"/>
@@ -968,6 +997,10 @@
       <dep package="ppp"/>
       <dep package="vala"/>
       <dep package="wireless-tools"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -985,6 +1018,10 @@
       <dep package="gtk+"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-journal"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="polkit-gobject"/>
@@ -1004,6 +1041,11 @@
       <dep package="polkit-gobject"/>
       <dep package="polkit-agent"/>
       <dep package="libatasmart"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd"/>
+        <dep package="libsystemd-daemon"/>
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-suites-core-deps-3.16.modules b/modulesets/gnome-suites-core-deps-3.16.modules
index b4def7a..4c06b2b 100644
--- a/modulesets/gnome-suites-core-deps-3.16.modules
+++ b/modulesets/gnome-suites-core-deps-3.16.modules
@@ -220,6 +220,9 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-journal"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -1309,6 +1312,9 @@
       <dep package="xorg-xf86driproto"/>
       <dep package="xorg-presentproto"/>
       <dep package="xorg-videoproto"/>
+      <if condition-set="systemd">
+        <dep package="libsystemd-daemon"/>
+      </if>
     </dependencies>
   </autotools>
 
@@ -1419,6 +1425,9 @@
         <dep package="libgusb"/>
         <dep package="gudev"/>
       </if>
+      <if condition-set="systemd">
+        <dep package="libsystemd-login"/>
+      </if>
     </dependencies>
     <suggests>
       <dep package="polkit-gobject"/>
diff --git a/modulesets/gnome-sysdeps-3.16.modules b/modulesets/gnome-sysdeps-3.16.modules
index 7e988b0..ce09e1e 100644
--- a/modulesets/gnome-sysdeps-3.16.modules
+++ b/modulesets/gnome-sysdeps-3.16.modules
@@ -605,10 +605,19 @@
             version="210"/>
   </systemmodule>
 
+  <systemmodule id="libsystemd-daemon">
+    <pkg-config>libsystemd-daemon.pc</pkg-config>
+    <branch repo="system" version="210"/>
+  </systemmodule>
+
   <systemmodule id="libsystemd-journal">
     <pkg-config>libsystemd-journal.pc</pkg-config>
-    <branch repo="system"
-            version="201"/>
+    <branch repo="system" version="201"/>
+  </systemmodule>
+
+  <systemmodule id="libsystemd-login">
+    <pkg-config>libsystemd-login.pc</pkg-config>
+    <branch repo="system" version="210"/>
   </systemmodule>
 
   <systemmodule id="libtasn1">