Just use the system xapian.

8 files changed, 12 insertions, 38 deletions

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index ca67d01..4eca3b1 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -83,19 +83,6 @@
       <dep package="libmatchbox"/>
     </dependencies>
   </autotools>
-  <tarball id="xapian-core" version="1.0.2">
-    <source href="http://oligarchy.co.uk/xapian/1.0.2/xapian-core-1.0.2.tar.gz"
-            size="6530186" md5sum="9e7f0498bba8a6dad9474f20a8bd17c1"/>
-    <dependencies>
-    </dependencies>
-  </tarball>
-  <tarball id="xapian-bindings" version="1.0.2" autogenargs="--with-python=yes --with-php=no --with-ruby=no --with-tcl=no --with-csharp=no --with-java=no">
-    <source href="http://oligarchy.co.uk/xapian/1.0.2/xapian-bindings-1.0.2.tar.gz"
-            size="984769" md5sum="98d335ded1a509d24646df82ee1ad463"/>
-    <dependencies>
-        <dep package="xapian-core"/>
-    </dependencies>
-  </tarball>
   <tarball id="xulrunner" autogenargs="--disable-accessibility --with-pthreads --disable-strip --disable-install-strip --disable-tests --enable-debug --disable-installer --enable-optimize --enable-xinerama --enable-default-toolkit=cairo-gtk2 --disable-xprint --enable-pango --enable-svg --enable-canvas --enable-application=xulrunner --disable-javaxpcom --disable-gnomeui --disable-gnomevfs --disable-airbag --enable-extensions=default,cookie,python/xpcom --disable-crashreporter" version="1.9" checkoutdir="mozilla">
     <source href="http://dev.laptop.org/pub/sugar/xulrunner/xulrunner-1.9-source.tar.bz2"
             size="37018711" md5sum="b514375509fd439e44def1e4a7873af4"/>
diff --git a/config/modulesets/glucose.modules b/config/modulesets/glucose.modules
index 4eaca1a..dfc0d51 100644
--- a/config/modulesets/glucose.modules
+++ b/config/modulesets/glucose.modules
@@ -46,7 +46,6 @@
   <autotools id="datastore">
     <branch repo="dev.laptop.org/projects"/>
     <dependencies>
-      <dep package="xapian-bindings"/>
       <dep package="dbus-python"/>
     </dependencies>
   </autotools>
diff --git a/config/sysdeps/fedora-8.xml b/config/sysdeps/fedora-8.xml
index 3a1df2d..19dacee 100644
--- a/config/sysdeps/fedora-8.xml
+++ b/config/sysdeps/fedora-8.xml
@@ -41,11 +41,9 @@
   <package name="icon-slicer"/>
   <package name="pygtksourceview"/>
   <package name="alsa-lib-devel"/>
+  <package name="xapian-bindings-python"/>
+  <package name="xapian-core-libs"/>
 
-  <package name="xapian-bindings-python"
-           source="xapian-bindings"/>
-  <package name="xapian-core-libs"
-           source="xapian-core"/>
   <package name="dbus-python"
            source="dbus-python"/>
   <package name="dbus-devel"
diff --git a/config/sysdeps/fedora-9.xml b/config/sysdeps/fedora-9.xml
index 93e101a..87dea2a 100644
--- a/config/sysdeps/fedora-9.xml
+++ b/config/sysdeps/fedora-9.xml
@@ -40,11 +40,9 @@
   <package name="icon-slicer"/>
   <package name="pygtksourceview"/>
   <package name="alsa-lib-devel"/>
+  <package name="xapian-bindings-python"/>
+  <package name="xapian-core-libs"/>
 
-  <package name="xapian-bindings-python"
-           source="xapian-bindings"/>
-  <package name="xapian-core-libs"
-           source="xapian-core"/>
   <package name="dbus-python"
            source="dbus-python"/>
   <package name="dbus-devel"
diff --git a/config/sysdeps/fedora-rawhide.xml b/config/sysdeps/fedora-rawhide.xml
index 93e101a..87dea2a 100644
--- a/config/sysdeps/fedora-rawhide.xml
+++ b/config/sysdeps/fedora-rawhide.xml
@@ -40,11 +40,9 @@
   <package name="icon-slicer"/>
   <package name="pygtksourceview"/>
   <package name="alsa-lib-devel"/>
+  <package name="xapian-bindings-python"/>
+  <package name="xapian-core-libs"/>
 
-  <package name="xapian-bindings-python"
-           source="xapian-bindings"/>
-  <package name="xapian-core-libs"
-           source="xapian-core"/>
   <package name="dbus-python"
            source="dbus-python"/>
   <package name="dbus-devel"
diff --git a/config/sysdeps/ubuntu-7.04.xml b/config/sysdeps/ubuntu-7.04.xml
index 376ca84..2520722 100644
--- a/config/sysdeps/ubuntu-7.04.xml
+++ b/config/sysdeps/ubuntu-7.04.xml
@@ -34,11 +34,9 @@
   <package name="x11-utils"/>
   <package name="icon-slicer"/>
   <package name="libasound2-dev"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
 
-  <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"
diff --git a/config/sysdeps/ubuntu-7.10.xml b/config/sysdeps/ubuntu-7.10.xml
index b06065a..ea48021 100644
--- a/config/sysdeps/ubuntu-7.10.xml
+++ b/config/sysdeps/ubuntu-7.10.xml
@@ -40,11 +40,9 @@
   <package name="x11-utils"/>
   <package name="icon-slicer"/>
   <package name="libasound2-dev"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
 
-  <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"
diff --git a/config/sysdeps/ubuntu-8.04.xml b/config/sysdeps/ubuntu-8.04.xml
index 8851204..4ce9182 100644
--- a/config/sysdeps/ubuntu-8.04.xml
+++ b/config/sysdeps/ubuntu-8.04.xml
@@ -40,11 +40,9 @@
   <package name="x11-utils"/>
   <package name="icon-slicer"/>
   <package name="libasound2-dev"/>
+  <package name="python-xapian"/>
+  <package name="libxapian15"/>
 
-  <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"