[gedit/wip/3.14-osx: 64/69] [osx] Sort repositories

[Jesse van den Kieboom <jessevdk src gnome org>]

commit ba4382c8d0266a5f88ae62aa3412db2e020d2804
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Mon Aug 25 19:09:20 2014 +0200

    [osx] Sort repositories

 osx/build/modulesets/bootstrap.modules |   20 +++++++++---------
 osx/build/modulesets/gedit.modules     |   34 ++++++++++++++++----------------
 osx/build/updater/update_modulesets.py |    7 ++++-
 3 files changed, 32 insertions(+), 29 deletions(-)
---
diff --git a/osx/build/modulesets/bootstrap.modules b/osx/build/modulesets/bootstrap.modules
index 0c5eb9a..e6dfdc5 100644
--- a/osx/build/modulesets/bootstrap.modules
+++ b/osx/build/modulesets/bootstrap.modules
@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<moduleset><repository type="tarball" name="xmlsoft.org" href="ftp://xmlsoft.org/libxml2/"/>
-  <repository type="tarball" name="intltool" href="http://launchpad.net/intltool/trunk/"/>
-
+<moduleset><repository type="tarball" name="apache.org" href="http://archive.apache.org/dist/"/>
   <repository type="tarball" name="cmake" href="http://www.cmake.org/files/"/>
-  <repository type="tarball" name="python" href="http://www.python.org/ftp/python/"/>
-  <repository type="tarball" name="apache.org" href="http://archive.apache.org/dist/"/>
-  <repository type="tarball" name="pkgconfig" href="http://pkgconfig.freedesktop.org/releases/"/>
-  <repository type="tarball" name="tukaani.org" href="http://tukaani.org/"/>
-  <repository type="tarball" name="itstool.org" href="http://files.itstool.org/itstool/"/>
-  <repository type="tarball" name="sourceforge" href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"/>
   <repository type="tarball" name="ftp.gnome.org" default="yes" 
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
+  <repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
+  <repository type="tarball" name="intltool" href="http://launchpad.net/intltool/trunk/"/>
+
+  <repository type="tarball" name="itstool.org" href="http://files.itstool.org/itstool/"/>
   <repository type="tarball" name="oracle" href="http://download.oracle.com/"/>
 
-  <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" href="http://www.python.org/ftp/python/"/>
+  <repository type="tarball" name="sourceforge" href="http://downloads.sourceforge.net/sourceforge/"/>
+  <repository type="tarball" name="tukaani.org" href="http://tukaani.org/"/>
+  <repository type="tarball" name="xmlsoft.org" href="ftp://xmlsoft.org/libxml2/"/>
   <autotools id="berkeleydb-nonsrctree" autogen-sh="configure" 
autogen-template="%(srcdir)s/dist/%(autogen-sh)s --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s">
 
     <branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30" repo="oracle">
diff --git a/osx/build/modulesets/gedit.modules b/osx/build/modulesets/gedit.modules
index 6886e7c..2b46a3f 100644
--- a/osx/build/modulesets/gedit.modules
+++ b/osx/build/modulesets/gedit.modules
@@ -1,31 +1,31 @@
 <?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<moduleset><repository type="tarball" name="libtiff" href="http://download.osgeo.org/"/>
-  <repository type="tarball" name="abisource/enchant" href="http://www.abisource.com/downloads/enchant/"/>
-  <repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
-  <repository type="git" name="git.gnome.org" href="git://git.gnome.org/"/>
-  <repository type="tarball" name="hadess" href="http://freedesktop.org/~hadess/"/>
+<moduleset><repository type="tarball" name="abisource/enchant" 
href="http://www.abisource.com/downloads/enchant/"/>
+  <repository type="tarball" name="cairographics" href="http://cairographics.org/releases/"/>
+
+  <repository type="tarball" name="cairographics.org" href="http://cairographics.org/releases/"/>
   <repository type="tarball" name="cups" href="http://ftp.easysw.com/pub/"/>
 
-  <repository type="tarball" name="sourceforge" href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="fontconfig" 
href="http://www.freedesktop.org/software/fontconfig/release/"/>
-  <repository type="tarball" name="xmlsoft.org" href="ftp://xmlsoft.org/libxml2/"/>
-  <repository type="tarball" name="icon-theme" href="http://icon-theme.freedesktop.org/releases/"/>
-  <repository type="tarball" name="cairographics.org" href="http://cairographics.org/releases/"/>
-  <repository type="tarball" name="python" href="https://www.python.org/ftp/python/"/>
-  <repository type="tarball" name="jpeg" href="http://www.ijg.org/files/"/>
-  <repository type="tarball" name="iso-codes" href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
+  <repository type="tarball" name="ftp.gnome.org" default="yes" 
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
+  <repository type="tarball" name="ftp.gnu.org" href="ftp://ftp.gnu.org/gnu/"/>
   <repository type="git" name="git.github.com" href="https://github.com/"/>
 
-  <repository type="tarball" name="tango.freedesktop.org" href="http://tango.freedesktop.org/releases/"/>
-  <repository type="tarball" name="ftp.gnome.org" default="yes" 
href="ftp://ftp.gnome.org/pub/gnome/sources/"/>
+  <repository type="git" name="git.gnome.org" href="git://git.gnome.org/"/>
+  <repository type="tarball" name="hadess" href="http://freedesktop.org/~hadess/"/>
+  <repository type="tarball" name="harfbuzz" href="http://www.freedesktop.org/software/harfbuzz/release/"/>
+  <repository type="tarball" name="icon-theme" href="http://icon-theme.freedesktop.org/releases/"/>
+  <repository type="tarball" name="iso-codes" href="http://pkg-isocodes.alioth.debian.org/downloads/"/>
+  <repository type="tarball" name="jpeg" href="http://www.ijg.org/files/"/>
+  <repository type="tarball" name="libtiff" href="http://download.osgeo.org/"/>
   <repository type="tarball" name="oracle" href="http://download.oracle.com/"/>
+  <repository type="tarball" name="python" href="https://www.python.org/ftp/python/"/>
+  <repository type="tarball" name="sourceforge" href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="sourceware.org" href="ftp://sourceware.org/pub/"/>
 
-  <repository type="tarball" name="cairographics" href="http://cairographics.org/releases/"/>
-
+  <repository type="tarball" name="tango.freedesktop.org" href="http://tango.freedesktop.org/releases/"/>
   <repository type="tarball" name="tarball.github.com" href="https://github.com/"/>
-  <repository type="tarball" name="harfbuzz" href="http://www.freedesktop.org/software/harfbuzz/release/"/>
+  <repository type="tarball" name="xmlsoft.org" href="ftp://xmlsoft.org/libxml2/"/>
   <autotools id="libcroco" autogenargs="--disable-Bsymbolic" autogen-sh="configure">
     <branch module="libcroco/0.6/libcroco-0.6.8.tar.xz" version="0.6.8" 
hash="sha256:ea6e1b858c55219cefd7109756bff5bc1a774ba7a55f7d3ccd734d6b871b8570" repo="ftp.gnome.org"/>
   </autotools>
diff --git a/osx/build/updater/update_modulesets.py b/osx/build/updater/update_modulesets.py
index 605b2c8..1382297 100755
--- a/osx/build/updater/update_modulesets.py
+++ b/osx/build/updater/update_modulesets.py
@@ -283,8 +283,11 @@ class Merger:
         with open(f, 'w') as f:
             root = ET.Element('moduleset')
 
-            for repo in needed_repos:
-                root.append(needed_repos[repo])
+            repos = needed_repos.values()
+            repos.sort(lambda a, b: cmp(a.attrib['name'], b.attrib['name']))
+
+            for repo in repos:
+                root.append(repo)
 
             for mod in self.required_modules:
                 root.append(mod)