[gtk-osx] Set up dependencies for Guile2, update Guile2 to 2.0.9

[John Ralls <jralls src gnome org>]

commit b4aa6f46fcbb73f53952b91caae3723ab3bcde7e
Author: John Ralls <jralls ceridwen us>
Date:   Fri Feb 14 21:56:32 2014 -0800

    Set up dependencies for Guile2, update Guile2 to 2.0.9

 modulesets-stable/gtk-osx-random.modules   |   17 +++++++++++++++--
 modulesets-unstable/gtk-osx-random.modules |   21 ++++++++++++++++++++-
 modulesets/gtk-osx-random.modules          |   25 ++++++++++++++++++++++++-
 3 files changed, 59 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 29e1b5e..dcd33d2 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -26,6 +26,8 @@
              href="ftp://ftp.gmplib.org/pub/"/>
   <repository type="git" name="git.gnome.org"
               href="git://git.gnome.org/"/>
+  <repository type="tarball" name="boehm"
+             href="http://www.hpl.hp.com/personal/Hans_Boehm/"/>
 
   <metamodule id="meta-gtk-osx-random">
     <dependencies>
@@ -380,6 +382,14 @@ Libglade itself is deprecated. This is the last release. -->
     <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2"/>
   </autotools>
 
+  <autotools id="libunistring" autogen-sh="configure">
+    <branch repo="ftp.gnu.org" module="libunistring/libunistring-0.9.3.tar.gz"
+           version="0.9.3"/>
+  </autotools>
+
+  <autotools id="bdw-gc" autogen-sh="configure">
+    <branch repo="boehm" module="gc/gc_source/gc-7.2e.tar.gz" version="7.2e"/>
+  </autotools>
 
   <autotools id="guile" autogen-sh="configure"
             autogenargs="--disable-error-on-warning">
@@ -391,10 +401,13 @@ Libglade itself is deprecated. This is the last release. -->
   </autotools>
 
   <autotools id="guile2" autogen-sh="configure">
-    <branch repo="ftp.gnu.org" module="guile/guile-2.0.6.tar.gz"
-           version="2.0.6"/>
+    <branch repo="ftp.gnu.org" module="guile/guile-2.0.9.tar.gz"
+           version="2.0.9"/>
     <dependencies>
+      <dep package="libunistring"/>
       <dep package="gmp"/>
+      <dep package="libffi"/>
+      <dep package="bdw-gc"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 798e3d1..83810a7 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -26,8 +26,9 @@
              cvsroot=":pserver:anonymous gtkspell cvs sourceforge net:/cvsroot/gtkspell"
              password=""/>
   <repository type="git" name="savannah" href="git://git.sv.gnu/org/"/>
+  <repository type="git" name="github" href="https://github.com"/>
 
-    <metamodule id="meta-gtk-osx-random">
+  <metamodule id="meta-gtk-osx-random">
     <dependencies>
       <dep package="poppler"/>
       <dep package="gimp"/>
@@ -275,6 +276,14 @@
     <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.1.tar.bz2" version="4.3.1"/>
   </autotools>
 
+  <autotools id="libunistring" autogen-sh="configure">
+    <branch repo="savannah" module="libunistring.git" tag="v0.9.3"/>
+  </autotools>
+
+  <autotools id="bdw-gc" autogen-sh="configure">
+    <branch repo="github" module="ivmai/bdwgc" revision="release-7_2"/>
+  </autotools>
+
   <autotools id="guile" autogenargs="--disable-error-on-warning">
     <branch repo="savannah" module="guile.git"/>
     <dependencies>
@@ -282,6 +291,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="guile2" autogen-sh="configure">
+    <branch repo="savannah" module="guile.git" revision="stable-2.0"/>
+    <dependencies>
+      <dep package="libunistring"/>
+      <dep package="gmp"/>
+      <dep package="libffi"/>
+      <dep package="bdw-gc"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="hunspell" autogen-sh="configure">
     <branch repo="hunspell-cvs"/>
   </autotools>
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 15d5564..68d3a45 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -23,8 +23,9 @@
              cvsroot=":pserver:anonymous gtkspell cvs sourceforge net:/cvsroot/gtkspell"
              password=""/>
   <repository type="git" name="savannah" href="git://git.sv.gnu/org/"/>
+  <repository type="git" name="github" href="https://github.com"/>
 
-    <metamodule id="meta-gtk-osx-random">
+  <metamodule id="meta-gtk-osx-random">
     <dependencies>
       <dep package="poppler"/>
       <dep package="gimp"/>
@@ -319,6 +320,14 @@
     <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2"/>
   </autotools>
 
+  <autotools id="libunistring" autogen-sh="configure">
+    <branch repo="savannah" module="libunistring.git" tag="v0.9.3"/>
+  </autotools>
+
+  <autotools id="bdw-gc" autogen-sh="configure">
+    <branch repo="github" module="ivmai/bdwgc" revision="release-7_2"/>
+  </autotools>
+
   <autotools id="guile" autogenargs="--disable-error-on-warning">
     <branch repo="savannah" module="guile.git" tag="release_1_8_8"/>
     <dependencies>
@@ -326,4 +335,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="guile2" autogen-sh="configure">
+    <branch repo="savannah" module="guile.git" revision="stable-2.0"/>
+    <dependencies>
+      <dep package="libunistring"/>
+      <dep package="gmp"/>
+      <dep package="libffi"/>
+      <dep package="bdw-gc"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="hunspell" autogen-sh="configure">
+    <branch repo="hunspell-cvs"/>
+  </autotools>
+
 </moduleset>