From 9d4bcf514ae2a6f68f5b9ce28cb35addd65cf1f7 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Sat, 01 Dec 2012 17:22:11 +0000
Subject: Build gnome-keyring with XDG_HOME_DATA support

---
diff --git a/config/modules/system.json b/config/modules/system.json
index 2ee8893..99672f3 100644
--- a/config/modules/system.json
+++ b/config/modules/system.json
@@ -1,5 +1,15 @@
 [
     {
+        "branch": "gnome-3-4", 
+        "if": "gnome_version == '3.4'", 
+        "name": "gnome-keyring", 
+        "options_evaluated": [
+            "'--with-pkcs11-config=%s/etc' % prefix", 
+            "'--with-pkcs11-modules=%s/etc' % prefix"
+        ], 
+        "repo": "git://github.com/dnarvaez/gnome-keyring.git"
+    }, 
+    {
         "name": "glib", 
         "options": [
             "--disable-modular-tests"
diff --git a/devbot/build.py b/devbot/build.py
index 8740927..98cf368 100644
--- a/devbot/build.py
+++ b/devbot/build.py
@@ -97,6 +97,9 @@ def _pull_module(module):
 
     return True
 
+def _eval_option(option):
+    return eval(option, {"prefix": config.prefix_dir})
+
 def _build_autotools(module, log):
     makefile_path = os.path.join(module.get_build_dir(), "Makefile")
 
@@ -108,6 +111,9 @@ def _build_autotools(module, log):
                 "--libdir", config.lib_dir]
         args.extend(module.options)
 
+        for option in module.options_evaluated:
+            args.append(_eval_option(option))
+
         command.run(args, log)
 
     jobs = multiprocessing.cpu_count() * 2
diff --git a/devbot/config.py b/devbot/config.py
index 4c04a56..284e9a8 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -36,6 +36,7 @@ class Module:
         self.tag = info.get("tag", None)
         self.auto_install = info.get("auto-install", False)
         self.options = info.get("options", [])
+        self.options_evaluated = info.get("options_evaluated", [])
 
         if get_pref("BUILD_IN_SOURCE"):
             self.out_of_source = False
diff --git a/devbot/environ.py b/devbot/environ.py
index 2107792..d600cca 100644
--- a/devbot/environ.py
+++ b/devbot/environ.py
@@ -47,7 +47,8 @@ def _setup_variables():
                                        plat_specific=True))
     _add_path("PYTHONPATH",
               os.path.dirname(config.devbot_dir))
-
+    _add_path("XDG_DATA_HOME",
+              os.path.join(config.home_dir, "data"))
 
     _add_path("XDG_DATA_DIRS", "/usr/share")
     _add_path("XDG_DATA_DIRS", config.share_dir)
--
cgit v0.9.1