[jhbuild] bootstrap: move guile, python out of meta-bootstrap (GNOME bug 656818)

[Craig Keogh <cskeogh src gnome org>]

commit 3b8843eeb3dd0757e70eeaff64a5e87c0cd0034f
Author: Craig Keogh <cskeogh adam com au>
Date:   Tue Feb 7 21:37:59 2012 +1030

    bootstrap: move guile, python out of meta-bootstrap (GNOME bug 656818)

 modulesets/bootstrap.modules      |   13 -------------
 modulesets/gnome-apps-3.4.modules |   12 ++++++++++++
 modulesets/gnome-apps-3.6.modules |   12 ++++++++++++
 3 files changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/modulesets/bootstrap.modules b/modulesets/bootstrap.modules
index 8f34404..1d7ac68 100644
--- a/modulesets/bootstrap.modules
+++ b/modulesets/bootstrap.modules
@@ -1,8 +1,6 @@
 <?xml version="1.0" standalone="no"?> <!--*- mode: nxml -*-->
 <?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
 <moduleset>
-  <repository type="tarball" name="ftp.gnu.org"
-      href="ftp://ftp.gnu.org/gnu/"/>
   <repository type="tarball" name="pkgconfig"
       href="http://pkgconfig.freedesktop.org/releases/"/>
   <repository type="tarball" name="python"
@@ -71,15 +69,6 @@
     </branch>
   </autotools>
 
-  <autotools id="guile">
-    <pkg-config>guile-2.0.pc</pkg-config>
-    <branch repo="ftp.gnu.org"
-            module="guile/guile-2.0.3.tar.xz"
-            version="2.0.3"
-            hash="sha256:d2ebcd78dc587080b96d9120053a57d8e2d22c3d54a444dff06513d5fba53093"
-            size="4196064"/>
-  </autotools>
-
   <autotools id="xz">
     <branch repo="tukaani.org" module="xz/xz-5.0.1.tar.bz2" version="5.0.1"
             size="1005959" md5sum="cb6c7a58cec4d663a395c54d186ca0c6"
@@ -93,8 +82,6 @@
       <dep package="libtool" />
       <dep package="automake" />
       <dep package="pkg-config" />
-      <dep package="python" />
-      <dep package="guile" />
     </dependencies>
   </metamodule>
 
diff --git a/modulesets/gnome-apps-3.4.modules b/modulesets/gnome-apps-3.4.modules
index abf4417..0a5c7d3 100644
--- a/modulesets/gnome-apps-3.4.modules
+++ b/modulesets/gnome-apps-3.4.modules
@@ -46,6 +46,8 @@
       href="http://downloads.sourceforge.net/"/>
   <repository type="tarball" name="xiph.org"
         href="http://downloads.xiph.org/releases/"/>
+  <repository type="tarball" name="ftp.gnu.org"
+      href="http://ftp.gnu.org/gnu/"/>
 
   <include href="gnome-suites-core-3.4.modules"/>
 
@@ -235,6 +237,15 @@
     </suggests>
   </autotools>
 
+  <autotools id="guile">
+    <pkg-config>guile-2.0.pc</pkg-config>
+    <branch repo="ftp.gnu.org"
+            module="guile/guile-2.0.3.tar.xz"
+            version="2.0.3"
+            hash="sha256:d2ebcd78dc587080b96d9120053a57d8e2d22c3d54a444dff06513d5fba53093"
+            size="4196064"/>
+  </autotools>
+
   <autotools id="gupnp" autogenargs="--with-context-manager=network-manager">
     <branch />
     <dependencies>
@@ -1000,6 +1011,7 @@
       <dep package="libcanberra"/>
       <dep package="librsvg"/>
       <dep package="gconf"/>
+      <dep package="guile"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gnome-apps-3.6.modules b/modulesets/gnome-apps-3.6.modules
index 0aad698..6f88c3d 100644
--- a/modulesets/gnome-apps-3.6.modules
+++ b/modulesets/gnome-apps-3.6.modules
@@ -46,6 +46,8 @@
       href="http://downloads.sourceforge.net/"/>
   <repository type="tarball" name="xiph.org"
         href="http://downloads.xiph.org/releases/"/>
+  <repository type="tarball" name="ftp.gnu.org"
+      href="http://ftp.gnu.org/gnu/"/>
 
   <include href="gnome-suites-core-3.6.modules"/>
 
@@ -224,6 +226,15 @@
     </suggests>
   </autotools>
 
+  <autotools id="guile">
+    <pkg-config>guile-2.0.pc</pkg-config>
+    <branch repo="ftp.gnu.org"
+            module="guile/guile-2.0.3.tar.xz"
+            version="2.0.3"
+            hash="sha256:d2ebcd78dc587080b96d9120053a57d8e2d22c3d54a444dff06513d5fba53093"
+            size="4196064"/>
+  </autotools>
+
   <autotools id="gupnp" autogenargs="--with-context-manager=network-manager">
     <branch />
     <dependencies>
@@ -990,6 +1001,7 @@
       <dep package="libcanberra"/>
       <dep package="librsvg"/>
       <dep package="gconf"/>
+      <dep package="guile"/>
     </dependencies>
   </autotools>