[Lunar-commits] <moonbase> dbus: Solving the XML renderer madness once and for all.

[Moritz Heiber]

commit 6e6c849cd42aa35b83d24b8c3265a48733b77b75
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Mon Mar 3 13:35:37 2008 +0100

    dbus: Solving the XML renderer madness once and for all.
    
    First of all, expat is a pretty basic package. Its tiny compared to libxml2 and takes little to none time to compile. Plus, its also being used by hal .. which has become as vital as dbus to any linux system these days.
    
    And secondly, this warning confined in the configure script of dbus is pretty obvious:
    
    WARNING: You have chosen to use libxml as your xml parser however this code path is not maintained by the D-Bus developers and if it breaks you get to keep the pieces.  If you have selected this option in err please reconfigure with expat (e.g. --with-xml=expat).
    
    Therefore, from now on, we'll be using expat excusively. At least with this module.
---
 devel/dbus/BUILD   |   12 ++++--------
 devel/dbus/DEPENDS |    2 +-
 devel/dbus/DETAILS |    1 -
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/devel/dbus/BUILD b/devel/dbus/BUILD
index abdd14e..272913e 100644
--- a/devel/dbus/BUILD
+++ b/devel/dbus/BUILD
@@ -10,14 +10,10 @@
     OPTS="$OPTS --disable-mono"
   fi
 
-  # Figure out which XML library to use (expat or libxml2 - without the 2
-  # at the end though).
-  XMLLIB=$(get_local_config LUNAR_ALIAS_XMLRENDERER | sed 's/2//g')
-
-  OPTS="$OPTS --with-x --enable-checks --enable-verbose-mode              \
-        --with-xml=$XMLLIB --with-system-pid-file=/var/run/messagebus.pid \
-        --with-system-socket=/var/lib/dbus/system_bus_socket              \
-        --with-session-socket-dir=/tmp  --with-dbus-user=messagebus       \
+  OPTS="$OPTS --with-x --enable-checks --with-xml=expat 
+        --with-system-pid-file=/var/run/messagebus.pid \
+        --with-system-socket=/var/lib/dbus/system_bus_socket \
+        --with-session-socket-dir=/tmp  --with-dbus-user=messagebus \
         --disable-xml-docs --with-init-scripts=none"
 
   default_build  &&
diff --git a/devel/dbus/DEPENDS b/devel/dbus/DEPENDS
index 48620dc..3d3b99d 100644
--- a/devel/dbus/DEPENDS
+++ b/devel/dbus/DEPENDS
@@ -1,2 +1,2 @@
 depends pkgconfig
-depends %XMLRENDERER
+depends expat
diff --git a/devel/dbus/DETAILS b/devel/dbus/DETAILS
index cea8cc7..c6e143a 100644
--- a/devel/dbus/DETAILS
+++ b/devel/dbus/DETAILS
@@ -6,7 +6,6 @@
         WEB_SITE=http://dbus.freedesktop.org/
          ENTERED=20031219
          UPDATED=20080302
-      MAINTAINER=nhudson at lunar-linux.org
            SHORT="A message bus system for applications"
 cat << EOF
 D-BUS is a message bus system, a simple way for applications to talk