scripts/jhbuild: remove

Remove the jhbuild2oe script and the copies of very old GNOME modulesets as
nobody has used them for a long time.

Signed-off-by: Ross Burton <ross.burton@intel.com>

17 files changed, 0 insertions, 16010 deletions

diff --git a/scripts/jhbuild/jhbuild2oe.py b/scripts/jhbuild/jhbuild2oe.py
deleted file mode 100755
index 9b31cafb69..0000000000
--- a/scripts/jhbuild/jhbuild2oe.py
+++ /dev/null
@@ -1,278 +0,0 @@
-#!/usr/bin/env python
-# Available modulesets:
-#
-# bootstrap.modules
-# freedesktop.modules
-# gcj.modules
-# gnome-2.10.modules
-# gnome-2.12.modules
-# gnome-2.14.modules
-# gnome-2.16.modules
-# gnutls.modules
-# gtk28.modules
-# gtk.modules
-# xorg-7.0.modules
-# xorg.modules
-
-moduleset = 'xorg.modules'
-
-
-
-import cElementTree as ElementTree
-# import lxml.etree as ElementTree
-import re, os, bb, bb.data
-
-class Handlers(object):
-    """
-    Class to act as a store for handlers of jhbuild xml elements, and as a
-    dispatcher of parsed Elements to those handlers.
-
-    These handlers exist to take an xml element from the jhbuild files and
-    either produce bitbake metadata in self.packages, or produce data which
-    will be used by other element handlers to do so.
-
-    Handlers(filename) -> new object to parse and process jhbuild file of
-                          name 'filename'.
-    """
-
-    cvsrootpat = re.compile(r'''
-        \s*                 # Skip leading whitespace
-        :(?P<scheme>[^:]+): # scheme (i.e. pserver, ext)
-        ((?P<user>\S+?)@)?  # username
-        (?P<host>\S+?):     # non-greedy match of the remote host
-        (?P<path>\S+)       # remote path
-    ''', re.VERBOSE)
-
-
-    def __init__(self, msfile):
-        self.msfile = msfile
-        self.msbasename = os.path.basename(msfile)
-        self.msdirname = os.path.dirname(msfile)
-
-        self.handled = {}
-
-        self.cvsroots = {}
-        self.repositories = {}
-        self.packages = []
-
-    def handle(self, element, parent):
-        import sys
-        """
-        XML Element dispatch function.  Can be called both from outside the
-        Handlers object to initiate handling, and from within individual XML
-        element handlers to ensure that dependent elements have been handled.
-
-        Does not handle a given XML Element more than once, as it retains
-        information about the handling state of the Elements it encounters.
-        """
-
-        try:
-            state = self.handled[element]
-        except KeyError:
-            pass
-        except:
-            return
-
-        try:
-            self.__class__.__dict__[element.tag](self, element, parent)
-            self.handled[element] = True
-        except KeyError:
-            self.handled[element] = False
-            sys.__stderr__.write('Unhandled element: %s\n' % element.tag)
-        except Exception:
-            sys.__stderr__.write('Error handling %s: %s:\n    %s\n' % (element.tag, sys.exc_type, sys.exc_value))
-            self.handled[element] = False
-
-        print('handle(%s, %s) -> %s' % (element, parent, self.handled[element]))
-        return self.handled[element]
-
-    def cvsroot(self, element, parent):
-        # Rip apart the cvsroot style location to build a cvs:// url for
-        # bitbake's usage in the cvsmodule handler.
-        # root=":pserver:anoncvs@cvs.freedesktop.org:/cvs/fontconfig"
-        print("cvsroot(%s, %s)" % (element, parent))
-
-        root = element.attrib.get('root')
-        rootmatch = re.match(Handlers.cvsrootpat, root)
-        name = element.attrib.get('name')
-        user = rootmatch.group('user') or ''
-        if user != '':
-            pw = element.attrib.get('password') or ''
-            if pw != '':
-                pw = ':' + pw + '@'
-            else:
-                user = user + '@'
-        print('user: %s' % user)
-        print('pw: %s' % pw)
-
-        host = rootmatch.group('host')
-        print('host: %s' % host)
-        path = rootmatch.group('path') or '/'
-        print('path: %s' % path)
-
-        root = "cvs://%s%s%s%s" % (user, pw, host, path)
-        print('root: %s' % root)
-        self.cvsroots[name] = root
-
-    def cvsmodule(self, element, parent):
-        rootlist = [root for root in list(parent) if root.attrib.get('name') == element.attrib.get('cvsroot')]
-        if len(rootlist) < 1:
-            raise Exception("Error: cvsmodule '%s' requires cvsroot '%s'." % (element.attrib.get('module'), element.attrib.get('cvsroot')))
-
-        cvsroot = rootlist[0]
-
-
-    def include(self, element, parent):
-        href = element.attrib.get('href')
-        fullhref = os.path.join(self.msdirname, href)
-        tree = ElementTree.ElementTree(file=fullhref)
-        elem = tree.getroot()
-
-        # Append the children of the newly included root element to the parent
-        # element, and manually handle() them, as the currently running
-        # iteration isn't going to hit them.
-        for child in elem:
-            self.handle(child, elem)
-            parent.append(elem)
-
-    def repository(self, element, parent):
-        # TODO:
-        # Convert the URL in the href attribute, if necessary, to the format
-        # which bitbake expects to see in SRC_URI.
-        name = element.attrib.get('name')
-        self.repositories[name] = element.attrib.get('href')
-
-
-    def moduleset(self, element, parent):
-        for child in element:
-            self.handle(child, element)
-
-    def packagename(self, name):
-        # mangle name into an appropriate bitbake package name
-        return name.replace('/', '-') 
-
-    def metamodule(self, element, parent):
-        # grab the deps
-        deps = None
-        for child in element:
-            if child.tag == 'dependencies':
-                deps = [self.packagename(dep.attrib.get('package')) for dep in child if dep.tag == "dep"]
-
-        # create the package
-        d = bb.data.init()
-        pn = self.packagename(element.attrib.get('id'))
-        d.setVar('PN', pn)
-        bb.data.setVar('DEPENDS', ' '.join(deps), d)
-        d.setVar('_handler', 'metamodule')
-        self.packages.append(d)
-
-    def autotools(self, element, parent):
-        deps = None
-        branch = None
-        for child in element:
-            if child.tag == 'dependencies':
-                deps = [self.packagename(dep.attrib.get('package')) for dep in child if dep.tag == "dep"]
-            elif child.tag == 'branch':
-                branch = child
-
-        # create the package
-        d = bb.data.init()
-        id = element.attrib.get('id')
-        if id is None:
-            raise Exception('Error: autotools element has no id attribute.')
-        pn = self.packagename(id)
-        d.setVar('PN', pn)
-        if deps is not None:
-            bb.data.setVar('DEPENDS', ' '.join(deps), d)
-
-        if branch is not None:
-            # <branch repo="git.freedesktop.org" module="xorg/xserver"/>
-            repo = os.path.join(self.repositories[branch.attrib.get('repo')], branch.attrib.get('module'))
-            d.setVar('SRC_URI', repo)
-
-            checkoutdir = branch.attrib.get('checkoutdir')
-            if checkoutdir is not None:
-                bb.data.setVar('S', os.path.join('${WORKDIR}', checkoutdir), d)
-
-        # build class
-        d.setVar('INHERITS', 'autotools')
-        d.setVarFlag('INHERITS', 'operator', '+=')
-        d.setVar('_handler', 'autotools')
-        self.packages.append(d)
-
-class Emitter(object):
-    """
-    Class which contains a single method for the emission of a bitbake
-    package from the bitbake data produced by a Handlers object.
-    """
-
-    def __init__(self, filefunc = None, basedir = None):
-        def _defaultfilefunc(package):
-            # return a relative path to the bitbake .bb which will be written
-            return package.getVar('PN', 1) + '.bb'
-
-        self.filefunc = filefunc or _defaultfilefunc
-        self.basedir = basedir or os.path.abspath(os.curdir)
-
-    def write(self, package, template = None):
-        # 1) Assemble new file contents in ram, either new from bitbake
-        #    metadata, or a combination of the template and that metadata.
-        # 2) Open the path returned by the filefunc + the basedir for writing.
-        # 3) Write the new bitbake data file.
-        fdata = ''
-        if template:
-            f = file(template, 'r')
-            fdata = f.read()
-            f.close()
-
-            for key in bb.data.keys(package):
-                fdata = fdata.replace('@@'+key+'@@', package.getVar(key))
-        else:
-            for key in bb.data.keys(package):
-                if key == '_handler':
-                    continue
-                elif key == 'INHERITS':
-                    fdata += 'inherit %s\n' % package.getVar('INHERITS')
-                else:
-                    oper = package.getVarFlag(key, 'operator') or '='
-                    fdata += '%s %s "%s"\n' % (key, oper, package.getVar(key))
-
-        if not os.path.exists(os.path.join(self.basedir, os.path.dirname(self.filefunc(package)))):
-            os.makedirs(os.path.join(self.basedir, os.path.dirname(self.filefunc(package))))
-
-        out = file(os.path.join(self.basedir, self.filefunc(package)), 'w')
-        out.write(fdata)
-        out.close()
-
-def _test():
-    msfile = os.path.join(os.path.abspath(os.curdir), 'modulesets', moduleset)
-    tree = ElementTree.ElementTree(file=msfile)
-    elem = tree.getroot()
-
-    handlers = Handlers(msfile)
-    handlers.handle(elem, None)
-
-    def filefunc(package):
-        # return a relative path to the bitbake .bb which will be written
-        src_uri = package.getVar('SRC_URI', 1)
-        filename = package.getVar('PN', 1) + '.bb'
-        if not src_uri:
-            return filename
-        else:
-            substr = src_uri[src_uri.find('xorg/'):]
-            subdirlist = substr.split('/')[:2]
-            subdir = '-'.join(subdirlist)
-            return os.path.join(subdir, filename)
-
-    emitter = Emitter(filefunc)
-    for package in handlers.packages:
-        template = emitter.filefunc(package) + '.in'
-        if os.path.exists(template):
-            print("%s exists, emitting based on template" % template)
-            emitter.write(package, template)
-        else:
-            print("%s does not exist, emitting non-templated" % template)
-            emitter.write(package)
-
-if __name__ == "__main__":
-    _test()
diff --git a/scripts/jhbuild/modulesets/bootstrap.modules b/scripts/jhbuild/modulesets/bootstrap.modules
deleted file mode 100644
index 9096b14662..0000000000
--- a/scripts/jhbuild/modulesets/bootstrap.modules
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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="http://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/"/>
-
-  <autotools id="gettext" autogen-sh="configure">
-    <branch repo="ftp.gnu.org"
-	    module="gettext/gettext-0.14.5.tar.gz" version="0.14.5"
-	    size="7105715" md5sum="e2f6581626a22a0de66dce1d81d00de3" />
-  </autotools>
-
-  <autotools id="autoconf" autogen-sh="configure">
-    <branch repo="ftp.gnu.org"
-	    module="autoconf/autoconf-2.59.tar.bz2" version="2.59"
-	    size="925073" md5sum="1ee40f7a676b3cfdc0e3f7cd81551b5f" />
-  </autotools>
-
-  <autotools id="libtool" autogen-sh="configure">
-    <branch repo="ftp.gnu.org"
-	    module="libtool/libtool-1.5.22.tar.gz" version="1.5.22"
-	    size="2921483" md5sum="8e0ac9797b62ba4dcc8a2fb7936412b0">
-      <patch file="libtool-1.5.18-multilib.patch" strip="1" />
-    </branch>
-  </autotools>
-
-  <autotools id="automake-1.4" autogen-sh="configure">
-    <branch repo="ftp.gnu.org"
-	    module="automake/automake-1.4-p6.tar.gz" version="1.4-p6"
-	    size="375060" md5sum="24872b81b95d78d05834c39af2cfcf05" />
-  </autotools>
-  <autotools id="automake-1.7" autogen-sh="configure">
-    <branch repo="ftp.gnu.org"
-	    module="automake/automake-1.7.9.tar.bz2" version="1.7.9"
-	    size="577705" md5sum="571fd0b0598eb2a27dcf68adcfddfacb" />
-  </autotools>
-  <autotools id="automake-1.8" autogen-sh="configure">
-    <branch repo="ftp.gnu.org"
-	    module="automake/automake-1.8.5.tar.bz2" version="1.8.5"
-	    size="663182" md5sum="0114aa6d7dc32112834b68105fb8d7e2" />
-  </autotools>
-  <autotools id="automake-1.9" autogen-sh="configure">
-    <branch repo="ftp.gnu.org"
-	    module="automake/automake-1.9.6.tar.bz2" version="1.9.6"
-	    size="765505" md5sum="c11b8100bb311492d8220378fd8bf9e0" />
-  </autotools>
-
-  <autotools id="pkg-config" autogen-sh="configure">
-    <branch repo="pkgconfig"
-	    module="pkg-config-0.20.tar.gz" version="0.20"
-	    size="969993" md5sum="fb42402593e4198bc252ab248dd4158b" />
-  </autotools>
-
-  <autotools id="python" autogenargs="--enable-shared" autogen-sh="configure">
-    <branch repo="python"
-	    module="2.4.3/Python-2.4.3.tar.bz2" version="2.4.3"
-	    size="8005915" md5sum="141c683447d5e76be1d2bd4829574f02" />
-  </autotools>
-
-  <repository type="tarball" name="pyrex"
-      href="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/"/>
-  <distutils id="pyrex">
-    <branch repo="pyrex"
-	    module="Pyrex-0.9.4.1.tar.gz" version="0.9.4.1"
-	    size="181507" md5sum="425f0543c634bc7a86fe4fce02e0e882" />
-  </distutils>
-
-  <metamodule id="meta-bootstrap">
-    <dependencies>
-      <dep package="gettext" />
-      <dep package="autoconf" />
-      <dep package="libtool" />
-      <dep package="automake-1.4" />
-      <dep package="automake-1.7" />
-      <dep package="automake-1.8" />
-      <dep package="automake-1.9" />
-      <dep package="pkg-config" />
-      <dep package="python" />
-      <dep package="pyrex" />
-    </dependencies>
-  </metamodule>
-
-</moduleset>
diff --git a/scripts/jhbuild/modulesets/freedesktop.modules b/scripts/jhbuild/modulesets/freedesktop.modules
deleted file mode 100644
index 698853e377..0000000000
--- a/scripts/jhbuild/modulesets/freedesktop.modules
+++ /dev/null
@@ -1,281 +0,0 @@
-<?xml version="1.0"?><!--*- mode: nxml -*-->
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-  <repository type="cvs" name="cairo.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/cairo"
-      password=""/>
-  <repository type="cvs" name="dbus.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/dbus"
-      password=""/>
-  <repository type="cvs" name="fontconfig.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/fontconfig"
-      password=""/>
-  <repository type="cvs" name="hal.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/hal"
-      password=""/>
-  <repository type="cvs" name="icon-theme.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/icon-theme"
-      password=""/>
-  <repository type="cvs" name="startup-notification.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/startup-notification"
-      password=""/>
-  <repository type="cvs" name="tango.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/tango"
-      password=""/>
-  <repository type="cvs" name="xorg.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xorg"
-      password=""/>
-  <repository type="cvs" name="poppler.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/poppler"
-      password=""/>
-  <repository type="cvs" name="system-tools-backends.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/system-tools-backends"
-      password=""/>
-  <repository type="cvs" name="gnome.org"
-      cvsroot=":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome"
-      password=""/>
-
-  <repository type="svn" name="avahi.0pointer.de"
-      href="svn://svn.0pointer.de/avahi/"/>
-  <repository type="svn" name="libdaemon.0pointer.de"
-      href="svn://svn.0pointer.de/libdaemon/"/>
-
-  <repository type="git" name="git.freedesktop.org"
-      href="git://anongit.freedesktop.org/git/"/>
-
-  <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/" />
-
-
-  <autotools id="cairo">
-    <branch repo="git.freedesktop.org" module="cairo"/>
-    <dependencies>
-      <dep package="fontconfig"/>
-      <dep package="libXrender"/>
-      <dep package="gtk-doc"/>
-    </dependencies>
-    <after>
-      <dep package="glitz"/>
-    </after>
-  </autotools>
-
-  <tarball id="cairo-1-0" version="1.0.4">
-    <source href="http://cairographics.org/releases/cairo-1.0.4.tar.gz"
-            size="1475777" md5sum="9002b0e69b3f94831a22d3f2a7735ce2"/>
-    <dependencies>
-      <dep package="fontconfig"/>
-      <dep package="libXrender"/>
-    </dependencies>
-    <after>
-      <dep package="glitz"/>
-    </after>
-  </tarball>
-
-  <autotools id="glitz">
-    <branch repo="cairo.freedesktop.org"/>
-  </autotools>
-
-  <autotools id="pycairo-1-0">
-    <branch repo="cairo.freedesktop.org" module="pycairo"
-            revision="RELEASE_1_0_2" checkoutdir="pycairo-1-0"/>
-    <dependencies>
-      <dep package="cairo-1-0"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="pycairo">
-    <branch repo="cairo.freedesktop.org"/>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="cairomm">
-    <branch repo="cairo.freedesktop.org"/>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dbus" supports-non-srcdir-builds="no">
-    <branch repo="dbus.freedesktop.org"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-    </after>
-  </autotools>
-
-  <autotools id="dbus-0.23" supports-non-srcdir-builds="no">
-    <branch repo="dbus.freedesktop.org" module="dbus"
-            revision="dbus-0-23" checkoutdir="dbus-0.23"/>
-    <dependencies>
-      <dep package="glib"/>
-    </dependencies>
-    <after>
-      <dep package="gtk+"/>
-    </after>
-  </autotools>
-
-  <!-- Not maintained - try dbusmm instead -->
-  <autotools id="dbus-cpp">
-    <branch repo="dbus.freedesktop.org"/>
-    <dependencies>
-      <dep package="dbus"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dbusmm">
-    <branch repo="dbus.freedesktop.org"/>
-    <dependencies>
-      <dep package="dbus"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="dbus-glib">
-    <branch repo="git.freedesktop.org" module="dbus/dbus-glib"/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <distutils id="dbus-python">
-    <branch repo="git.freedesktop.org" module="dbus/dbus-python"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </distutils>
-
-  <autotools id="PolicyKit">
-    <branch repo="hal.freedesktop.org"/>
-    <dependencies>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="hal">
-    <branch repo="hal.freedesktop.org"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="PolicyKit"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="hal-0-4">
-    <branch repo="hal.freedesktop.org" module="hal"
-            revision="hal-0_4-stable-branch" checkoutdir="hal-0.4"/>
-    <dependencies>
-      <dep package="dbus-0.23"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="fontconfig">
-    <branch repo="fontconfig.freedesktop.org" revision="fc-2_4_branch"/>
-  </autotools>
-
-  <autotools id="icon-slicer">
-    <branch repo="icon-theme.freedesktop.org"/>
-  </autotools>
-  <autotools id="icon-naming-utils">
-    <branch repo="icon-theme.freedesktop.org"/>
-  </autotools>
-  <tarball id="hicolor-icon-theme" version="0.9"
-           supports-non-srcdir-builds="no">
-    <source href="http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.9.tar.gz"
-            size="32574" md5sum="1d0821cb80d394eac30bd8cec5b0b60c"/>
-  </tarball>
-
-  <autotools id="tango-icon-theme">
-    <branch repo="tango.freedesktop.org"/>
-    <dependencies>
-      <dep package="icon-naming-utils"/>
-    </dependencies>
-  </autotools>
-  <autotools id="tango-icon-theme-extras">
-    <branch repo="tango.freedesktop.org"/>
-    <dependencies>
-      <dep package="tango-icon-theme"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="startup-notification">
-    <branch repo="startup-notification.freedesktop.org"/>
-  </autotools>
-
-  <autotools id="RenderProto">
-    <branch repo="git.freedesktop.org"
-	    module="xorg/proto/renderproto" checkoutdir="RenderProto" />
-  </autotools>
-  <autotools id="libXrender" supports-non-srcdir-builds="no">
-    <branch repo="git.freedesktop.org"
-	    module="xorg/lib/libXrender" checkoutdir="libXrender" />
-    <dependencies>
-      <dep package="RenderProto"/>
-    </dependencies>
-  </autotools>
-  <autotools id="libXft" supports-non-srcdir-builds="no">
-    <branch repo="git.freedesktop.org"
-	    module="xorg/lib/libXft" checkoutdir="libXft" />
-    <dependencies>
-      <dep package="fontconfig"/>
-      <dep package="libXrender"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="poppler">
-    <branch repo="poppler.freedesktop.org"/>
-    <dependencies>
-      <dep package="cairo"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="poppler-0-4">
-    <branch repo="poppler.freedesktop.org" module="poppler"
-            revision="POPPLER_0_4_X" checkoutdir="poppler-0-4"/>
-    <dependencies>
-      <dep package="cairo-1-0"/>
-    </dependencies>
-  </autotools>
-
-  <perl id="perl-net-dbus">
-    <branch repo="cpan"
-        module="authors/id/D/DA/DANBERR/Net-DBus-0.33.2.tar.gz" version="0.33.2"
-        size="83279" md5sum="7e722c48c4bca7740cf28512287571b7"/>
-    <dependencies>
-      <dep package="dbus"/>
-    </dependencies>
-  </perl>
-
-  <autotools id="system-tools-backends">
-    <branch repo="system-tools-backends.freedesktop.org" 
-            revision="BEFORE_DBUS_MERGE"/>
-    <suggests>
-      <dep package="perl-net-dbus"/>
-    </suggests>
-  </autotools>
-
-  <autotools id="system-tools-backends-1.4">
-    <branch repo="system-tools-backends.freedesktop.org"
-	    module="system-tools-backends" revision="stb-1-4"
-	    checkoutdir="system-tools-backends-1.4"/>
-  </autotools>
-
-  <autotools id="libdaemon">
-    <branch repo="libdaemon.0pointer.de" module="trunk" checkoutdir="libdaemon"/>
-  </autotools>
-
-  <!-- explicit disabling of qt3 and qt4 can be removed once avahi
-       correctly detects what is available. -->
-  <autotools id="avahi" autogenargs="--disable-qt3 --disable-qt4 --disable-mono --disable-monodoc --disable-manpages --enable-compat-howl --enable-compat-libdns_sd">
-    <branch repo="avahi.0pointer.de" module="trunk" checkoutdir="avahi"/>
-    <dependencies>
-      <dep package="libdaemon"/>
-      <dep package="dbus-python"/>
-      <dep package="pygtk"/>
-    </dependencies>
-  </autotools>
-
-</moduleset>
diff --git a/scripts/jhbuild/modulesets/gcj.modules b/scripts/jhbuild/modulesets/gcj.modules
deleted file mode 100644
index 01b35c6b62..0000000000
--- a/scripts/jhbuild/modulesets/gcj.modules
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: nxml -*-->
-<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-
-  <cvsroot name="gcc.gnu.org"
-     root=":pserver:anoncvs@gcc.gnu.org:/cvs/gcc"
-     password="" />
-  <cvsroot name="rhug.sources.redhat.com"
-     root=":pserver:anoncvs@sources.redhat.com:/cvs/rhug"
-     password="" />
-  <cvsroot name="gdb.sources.redhat.com"
-     root=":pserver:anoncvs@sources.redhat.com:/cvs/src"
-     password="anoncvs" />
-  <cvsroot name="gnome.org"
-     root=":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome"
-     password="" />
-  <cvsroot name="classpath.savannah.gnu.org"
-     root=":ext:anoncvs@savannah.gnu.org:/cvsroot/classpath"
-     password="" />
-  <cvsroot name="cairo.freedesktop.org"
-     root=":pserver:anoncvs@cvs.freedesktop.org:/cvs/cairo"
-     password="" />
-
-  <include href="gnome-2.12.modules" />
-
-  <gdbmodule id="gdb" cvsroot="gdb.sources.redhat.com" />
-
-  <gcjmodule id="gcj" cvsroot="gcc.gnu.org">
-    <dependencies>
-      <dep package="cairo" />
-      <dep package="gtk+" />
-    </dependencies>
-  </gcjmodule>
-
-  <cvsmodule id="java-gcj-compat" cvsroot="rhug.sources.redhat.com">
-    <dependencies>
-      <dep package="ecj-for-jhbuild" />
-      <dep package="gjdoc" />
-    </dependencies>
-  </cvsmodule>
-
-  <cvsmodule id="ecj-for-jhbuild" cvsroot="rhug.sources.redhat.com"
-	     supports-non-srcdir-builds="no">
-    <dependencies>
-      <dep package="gcj" />
-    </dependencies>
-  </cvsmodule>
-
-  <cvsmodule id="gjdoc" cvsroot="classpath.savannah.gnu.org" >
-    <dependencies>
-      <dep package="gcj" />
-    </dependencies>
-  </cvsmodule>
-
-  <cvsmodule id="jg-common" cvsroot="gnome.org">
-    <suggests>
-      <dep package="gcj" />
-    </suggests>
-    <dependencies>
-      <dep package="glib" />
-    </dependencies>
-  </cvsmodule>
-
-  <cvsmodule id="cairo-java" cvsroot="cairo.freedesktop.org">
-    <suggests>
-      <dep package="gcj" />
-    </suggests>
-    <dependencies>
-      <dep package="jg-common" />
-      <dep package="cairo" />
-    </dependencies>
-  </cvsmodule>
-
-  <cvsmodule id="libgtk-java" cvsroot="gnome.org">
-    <suggests>
-      <dep package="gcj" />
-    </suggests>
-    <dependencies>
-      <dep package="jg-common" />
-      <dep package="cairo-java" />
-    </dependencies>
-  </cvsmodule>
-
-  <cvsmodule id="libgnomevfs-java" cvsroot="gnome.org">
-    <suggests>
-      <dep package="gcj" />
-    </suggests>
-    <dependencies>
-      <dep package="libgtk-java" />
-    </dependencies>
-  </cvsmodule>
-  
-  <cvsmodule id="libgnome-java" cvsroot="gnome.org">
-    <suggests>
-      <dep package="gcj" />
-    </suggests>
-    <dependencies>
-     <dep package="libgnome" />
-     <dep package="libgnomeui" />
-     <dep package="libgnomecanvas" />
-     <dep package="libgtk-java" />
-    </dependencies>
-  </cvsmodule>
-  
-  <cvsmodule id="libglade-java" cvsroot="gnome.org">
-    <suggests>
-      <dep package="gcj" />
-    </suggests>
-    <dependencies>
-      <dep package="libgtk-java" />
-      <dep package="libgnome-java" />
-    </dependencies>
-  </cvsmodule>
-
-  <cvsmodule id="libgconf-java" cvsroot="gnome.org">
-    <suggests>
-      <dep package="gcj" />
-    </suggests>
-    <dependencies>
-      <dep package="libgtk-java" />
-      <dep package="libgnome-java" />
-    </dependencies>
-  </cvsmodule>
-
-  <metamodule id="java-gnome">
-    <dependencies>
-      <dep package="libgtk-java" />
-      <dep package="libgnome-java" />
-      <dep package="libglade-java" />
-      <dep package="libgconf-java" />
-    </dependencies>
-  </metamodule>
-
-</moduleset>
diff --git a/scripts/jhbuild/modulesets/gnome-2.10.modules b/scripts/jhbuild/modulesets/gnome-2.10.modules
deleted file mode 100644
index 4d2043203a..0000000000
--- a/scripts/jhbuild/modulesets/gnome-2.10.modules
+++ /dev/null
@@ -1,1621 +0,0 @@
-<?xml version="1.0"?><!--*- mode: nxml -*-->
-<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
-<moduleset>
-
-  <repository type="cvs" name="gnome.org" default="yes"
-      cvsroot=":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome"
-      password=""/>
-  <repository type="cvs" name="cairo.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/cairo"
-      password=""/>
-  <repository type="cvs" name="mozilla.org"
-      cvsroot=":pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot"
-      password="anonymous"/>
-  <repository type="cvs" name="gstreamer.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/gstreamer"
-      password=""/>
-  <repository type="cvs" name="menu.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/menus"
-      password=""/>
-  <repository type="cvs" name="mime.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/mime"
-      password=""/>
-  <repository type="cvs" name="xklavier.freedesktop.org"
-      cvsroot=":pserver:anoncvs@anoncvs.freedesktop.org:/cvs/xklavier"
-      password=""/>
-
-  <repository type="cvs" name="elysium-project.sf.net"
-      cvsroot=":pserver:anonymous@elysium-project.cvs.sourceforge.net:/cvsroot