Drop several modules which was skipped on all the supported distributions.

6 files changed, 18 insertions, 82 deletions

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 1d922cc..643c965 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -35,35 +35,7 @@
                         --with-distro=none">
     <source href="http://avahi.org/download/avahi-0.6.22.tar.gz"
             md5sum="c84b1a8a23126e188426728710414dc8" size="1199901"/>
-    <dependencies>
-      <dep package="dbus"/>
-    </dependencies>
-  </tarball>
-  <tarball id="dbus" version="1.1.0"
-           autogenargs="--disable-selinux --with-system-socket=/var/run/dbus/system_bus_socket">
-    <source href="http://dbus.freedesktop.org/releases/dbus/dbus-1.1.0.tar.gz"
-            md5sum="33da5c29ba1e83c07efeb8be8edae0ef" size="1317322"/>
-    <dependencies>
-    </dependencies>
-  </tarball>
-  <tarball id="dbus-glib" version="0.73">
-    <source href="http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.73.tar.gz"
-            md5sum="4563eeebae66828e30b72e2c1d90a92c" size="644223"/>
-    <dependencies>
-      <dep package="dbus"/>
-    </dependencies>
   </tarball>
-  <repository href="http://dbus.freedesktop.org/releases/dbus-python/" name="dbus/dbus-python" type="tarball"/>
-  <repository href="http://projects.collabora.co.uk/~smcv/" name="dbus-python-snapshots" type="tarball"/>
-  <autotools autogen-sh="configure" id="dbus-python">
-    <branch module="dbus-python-0.82.3.tar.gz"
-            md5sum="6b7626979b63994613a533a2d244c48c" size="488123"
-            repo="dbus/dbus-python" version="0.82.3"/>
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
   <tarball id="poppler" version="0.6.2">
     <source href="http://poppler.freedesktop.org/poppler-0.6.2.tar.gz"
             size="1289454" md5sum="9aa3247277f56d4ea8c045626531d19b"/>
@@ -137,12 +109,6 @@
       <dep package="pygobject"/>
     </dependencies>
   </autotools>
-  <tarball id="loudmouth" version="1.3.4">
-    <source href="http://ftp.imendio.com/pub/imendio/loudmouth/src/loudmouth-1.3.4.tar.bz2"
-            size="377910" md5sum="da5d7b788afbde39e2e06e5cb1194ff3"/>
-    <dependencies>
-    </dependencies>
-  </tarball>
   <autotools id="telepathy-gabble"
              autogen-sh="configure" autogenargs="--enable-olpc">
     <branch repo="telepathy"
@@ -153,9 +119,7 @@
       <patch file="telepathy-gabble-olpc-no-dbus-uid-check.patch" strip="1"/>
     </branch>
     <dependencies>
-      <dep package="loudmouth"/>
       <dep package="telepathy-glib"/>
-      <dep package="dbus"/>
     </dependencies>
   </autotools>
   <autotools id="telepathy-salut"
@@ -170,24 +134,18 @@
     <dependencies>
       <dep package="telepathy-glib"/>
       <dep package="avahi"/>
-      <dep package="dbus"/>
     </dependencies>
   </autotools>
   <autotools id="telepathy-glib" autogen-sh="configure">
     <branch repo="telepathy" version="0.7.17"
             module="telepathy-glib/telepathy-glib-0.7.17.tar.gz"
             size="2038612" md5sum="793de65fecf10cbf463e0899adf786c2" />
-    <dependencies>
-      <dep package="dbus"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
   </autotools>
   <distutils id="telepathy-python">
     <branch module="telepathy-python/telepathy-python-0.15.3.tar.gz"
             repo="telepathy" version="0.15.3"
             size="128246" md5sum="594a66a70764052e30df9428b5be52b2"/>
     <dependencies>
-      <dep package="dbus-python"/>
       <dep package="telepathy-gabble"/>
     </dependencies>
   </distutils>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 32b0a22..7782676 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -18,7 +18,6 @@
       <dep package="datastore"/>
       <dep package="hippo-canvas"/>
       <dep package="presence-service"/>
-      <dep package="dbus-python"/>
     </dependencies>
   </autotools> 
   <autotools id="sugar">
@@ -46,9 +45,6 @@
   </autotools>
   <autotools id="datastore">
     <branch repo="dev.laptop.org/projects"/>
-    <dependencies>
-      <dep package="dbus-python"/>
-    </dependencies>
   </autotools>
 
   <metamodule id="meta-glucose">
diff --git a/config/sysdeps/debian-unstable.xml b/config/sysdeps/debian-unstable.xml
index bfb0f46..cfa75cc 100644
--- a/config/sysdeps/debian-unstable.xml
+++ b/config/sysdeps/debian-unstable.xml
@@ -56,16 +56,10 @@
   <package name="icon-naming-utils"/>
   <package name="x11-utils"/>
   <package name="libasound2-dev"/>
-  <package name="python-xapian"
-           source="xapian-bindings"/>
-  <package name="libxapian15"
-           source="xapian-core"/>
-  <package name="python-dbus"
-           source="dbus-python"/>
-  <package name="libdbus-1-dev"
-           source="dbus"/>
-  <package name="libdbus-glib-1-dev"
-           source="dbus-glib"/>
-  <package name="libloudmouth1-dev"
-           source="loudmouth"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
+  <package name="python-dbus"/>
+  <package name="libdbus-1-dev"/>
+  <package name="libdbus-glib-1-dev"/>
+  <package name="libloudmouth1-dev"/>
 </dependencies>
diff --git a/config/sysdeps/fedora-9.xml b/config/sysdeps/fedora-9.xml
index 8376f5f..099d913 100644
--- a/config/sysdeps/fedora-9.xml
+++ b/config/sysdeps/fedora-9.xml
@@ -42,15 +42,11 @@
   <package name="xapian-bindings-python"/>
   <package name="xapian-core-libs"/>
   <package name="gnome-python2-gconf"/>
+  <package name="dbus-python"/>
+  <package name="dbus-devel"/>
+  <package name="dbus-glib-devel"/>
+  <package name="loudmouth-devel"/>
 
-  <package name="dbus-python"
-           source="dbus-python"/>
-  <package name="dbus-devel"
-           source="dbus"/>
-  <package name="dbus-glib-devel"
-           source="dbus-glib"/>
-  <package name="loudmouth-devel"
-           source="loudmouth"/>
   <package name="avahi"
            source="avahi"/>
   <package name="avahi-gobject-devel"
diff --git a/config/sysdeps/olpc-3.xml b/config/sysdeps/olpc-3.xml
index d140e6a..7b2dd32 100644
--- a/config/sysdeps/olpc-3.xml
+++ b/config/sysdeps/olpc-3.xml
@@ -42,15 +42,11 @@
   <package name="xapian-bindings-python"/>
   <package name="xapian-core-libs"/>
   <package name="gnome-python2-gconf"/>
+  <package name="dbus-python"/>
+  <package name="dbus-devel"/>
+  <package name="dbus-glib-devel"/>
+  <package name="loudmouth-devel"/>
 
-  <package name="dbus-python"
-           source="dbus-python"/>
-  <package name="dbus-devel"
-           source="dbus"/>
-  <package name="dbus-glib-devel"
-           source="dbus-glib"/>
-  <package name="loudmouth-devel"
-           source="loudmouth"/>
   <package name="avahi"
            source="avahi"/>
   <package name="avahi-gobject-devel"
diff --git a/config/sysdeps/ubuntu-8.04.xml b/config/sysdeps/ubuntu-8.04.xml
index 33b8665..6820e3d 100644
--- a/config/sysdeps/ubuntu-8.04.xml
+++ b/config/sysdeps/ubuntu-8.04.xml
@@ -43,15 +43,11 @@
   <package name="libxapian15"/>
   <package name="python-gtksourceview2"/>
   <package name="python-gconf"/>
+  <package name="python-dbus"/>
+  <package name="libdbus-1-dev"/>
+  <package name="libdbus-glib-1-dev"/>
+  <package name="libloudmouth1-dev"/>
 
-  <package name="python-dbus"
-           source="dbus-python"/>
-  <package name="libdbus-1-dev"
-           source="dbus"/>
-  <package name="libdbus-glib-1-dev"
-           source="dbus-glib"/>
-  <package name="libloudmouth1-dev"
-           source="loudmouth"/>
   <package name="libpoppler-dev"
            source="poppler"/>
 </dependencies>