[gtk-osx] Python needs expat to build xml parser

[John Ralls <jralls src gnome org>]

commit 9d68632dbbb7450d69a7a5888aaf21e0127fe6e7
Author: John Ralls <jralls ceridwen us>
Date:   Sun Nov 11 08:37:14 2012 -0800

    Python needs expat to build xml parser

 modulesets-stable/gtk-osx-python.modules   |    6 +++++-
 modulesets-unstable/gtk-osx-python.modules |   27 +++++++--------------------
 modulesets/gtk-osx-python.modules          |    6 +++++-
 3 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index eda7780..6f27401 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -47,10 +47,14 @@
         repo="oracle" />
   </autotools>
 
-  <autotools id="python" autogenargs="--enable-shared" autogen-sh="configure">
+  <autotools id="python" autogenargs="--enable-shared --with-system-expat"
+	     autogen-sh="configure">
     <branch repo="python"
 	    module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
     </branch>
+    <dependencies>
+      <dep package="expat"/>
+    </dependencies>
     <after>
       <dep package="berkeleydb"/>
     </after>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index cceab17..a45e765 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -30,23 +30,6 @@
     </dependencies>
   </metamodule>
 
-  <autotools id="berkeleydb4.7" autogen-sh="dist/configure"
-         autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix"
-         makeinstallargs="-C build_unix install">
-
-    <branch module="berkeley-db/db-4.7.25.NC.tar.gz" version="4.7.25"
-        repo="oracle" />
-  </autotools>
-
-  <autotools id="python2.6" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch repo="python"
-	    module="2.6.6/Python-2.6.6.tar.bz2" version="2.6.6">
-    </branch>
-    <after>
-      <dep package="berkeleydb4.7"/>
-    </after>
-  </autotools>
-
    <autotools id="berkeleydb4.8" autogen-sh="dist/configure"
          autogen-template="cd build_unix; ../%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s" makeargs="-C build_unix"
          makeinstallargs="-C build_unix install">
@@ -55,10 +38,14 @@
         repo="oracle" />
   </autotools>
 
-  <autotools id="python2.7" autogenargs="--enable-shared" autogen-sh="configure">
+  <autotools id="python2.7" autogenargs="--enable-shared --with-system-expat"
+	     autogen-sh="configure">
     <branch repo="python"
-	    module="2.7.2/Python-2.7.2.tar.bz2" version="2.7.2">
+	    module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
     </branch>
+    <dependencies>
+      <dep package="expat"/>
+    </dependencies>
     <after>
       <dep package="berkeleydb4.8"/>
     </after>
@@ -74,7 +61,7 @@
 
   <autotools id="python3.2" autogenargs="--enable-shared" autogen-sh="configure">
     <branch repo="python"
-	    module="3.2/Python-3.2.tar.bz2" version="3.2">
+	    module="3.3/Python-3.3.0.tar.bz2" version="3.3.0">
     </branch>
     <after>
       <dep package="berkeleydb5.0"/>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 722058d..bbf5675 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -41,10 +41,14 @@
         repo="oracle" />
   </autotools>
 
-  <autotools id="python" autogenargs="--enable-shared" autogen-sh="configure">
+  <autotools id="python" autogenargs="--enable-shared --with-system-expat"
+	     autogen-sh="configure">
     <branch repo="python"
 	    module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
     </branch>
+    <dependencies>
+      <dep package="expat"/>
+    </dependencies>
     <after>
       <dep package="berkeleydb"/>
     </after>