Index: general/sysutils/dbus-bindings.xml
===================================================================
--- general/sysutils/dbus-bindings.xml	(revision fe48aa6454d5e1f04751f59c030f6194cf91001f)
+++ general/sysutils/dbus-bindings.xml	(revision 2fdcd9df46cd1a5ebbbe3a92e3bdf169efa1b0f0)
@@ -14,9 +14,10 @@
   <!ENTITY dbus-python-download-http "http://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
   <!ENTITY dbus-python-download-ftp  " ">
-  <!ENTITY dbus-python-md5sum        "fe69a2613e824463e74f10913708c88a">
-  <!ENTITY dbus-python-size          "556 KB">
+  <!ENTITY dbus-python-md5sum        "775a8235736bf760cdd96e2d76546469">
+  <!ENTITY dbus-python-size          "572 KB">
   <!ENTITY dbus-python-buildsize     "5.5 MB">
   <!ENTITY dbus-python-time          "0.2 SBU">
-<!--
+
+  <!--
   <!ENTITY dbus-qt3-download-http "&trinity-repo-http;/dbus-tqt-&trinity-version;.tar.gz">
   <!ENTITY dbus-qt3-download-ftp  "&trinity-repo-ftp;/dbus-tqt-&trinity-version;.tar.gz">
@@ -25,11 +26,5 @@
   <!ENTITY dbus-qt3-buildsize     "4 MB">
   <!ENTITY dbus-qt3-time          "less than 0.1 SBU">
--->
-  <!ENTITY eggdbus-download-http   "http://hal.freedesktop.org/releases/eggdbus-&eggdbus-version;.tar.gz">
-  <!ENTITY eggdbus-download-ftp    " ">
-  <!ENTITY eggdbus-md5sum          "b43d2a6c523fcb8b9d0b0300c4222386">
-  <!ENTITY eggdbus-size            "801 KB">
-  <!ENTITY eggdbus-buildsize       "30 MB (includes installing the documentation and man page)">
-  <!ENTITY eggdbus-time            "0.4 SBU">
+  -->
 
   <!-- All the other bindings info should be here as well -->
@@ -60,7 +55,6 @@
     successfully.</para>
 
-    <para>The <application>GLib</application>,
-    <application>Python</application>, <application>Qt3</application>, and
-    <application>GObject</application> Bindings are included on this page. Other
+    <para>The <application>GLib</application> and
+    <application>Python</application> bindings are included on this page. Other
     language bindings are available at the <ulink
     url="http://www.freedesktop.org/wiki/Software/DBusBindings">D-Bus
@@ -76,8 +70,5 @@
       <!-- <listitem>
         <para><xref linkend="dbus-qt3"/></para>
-      </listitem>-->
-      <listitem>
-        <para><xref linkend="eggdbus"/></para>
-      </listitem>
+      </listitem> -->
     </itemizedlist>
 
@@ -146,5 +137,5 @@
 <screen><userinput>./configure --prefix=/usr \
             --sysconfdir=/etc \
-            --libexecdir=/usr/lib/dbus-1.0/dbus-1 &amp;&amp;
+            --libexecdir=/usr/lib/dbus-1.0 &amp;&amp;
 make</userinput></screen>
 
@@ -163,5 +154,5 @@
       <title>Command Explanations</title>
 
-      <para><parameter>--libexecdir=/usr/lib/dbus-1.0/dbus-1</parameter>: This
+      <para><parameter>--libexecdir=/usr/lib/dbus-1.0</parameter>: This
       moves <command>dbus-bash-completion-helper</command> out of <filename
       class="directory">/usr/libexec</filename>.</para>
@@ -169,4 +160,7 @@
       <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
     </sect3>
@@ -441,99 +435,5 @@
     </sect3>
   </sect2>
--->
-
-  <!-- Begin D-Bus GObject Bindings (EggDBus) -->
-  <sect2 id="eggdbus" xreflabel="D-Bus GObject Bindings-&eggdbus-version; (EggDBus)">
-    <title>D-Bus GObject Bindings (EggDBus)</title>
-
-    <indexterm zone="eggdbus">
-      <primary sortas="a-eggdbus">D-Bus GObject Bindings</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to EggDBus</title>
-
-      &lfs65_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>Download (HTTP): <ulink url="&eggdbus-download-http;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download (FTP): <ulink url="&eggdbus-download-ftp;"/></para>
-        </listitem>
-        <listitem>
-          <para>Download MD5 sum: &eggdbus-md5sum;</para>
-        </listitem>
-        <listitem>
-          <para>Download size: &eggdbus-size;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated disk space required: &eggdbus-buildsize;</para>
-        </listitem>
-        <listitem>
-          <para>Estimated build time: &eggdbus-time;</para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">EggDBus Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required"><xref linkend="dbus-glib"/> and
-      <xref linkend="docbook-xsl"/></para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional"><xref linkend="gtk-doc"/></para>
-
-      <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/eggdbus"/></para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of EggDBus</title>
-
-
-      <para>Install <application>EggDBus</application> by
-      running the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <para>To test the results, issue: <command>make check</command>.</para>
-
-      <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>eggdbus-binding-tool and eggdbus-glib-genmarshal</seg>
-          <seg>libeggdbus-1.{so,a}</seg>
-          <seg>/usr/include/eggdbus-1/eggdbus</seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
+  -->
 
 </sect1>
