Index: archive/bc.xml
===================================================================
--- archive/bc.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/bc.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+    <!-- Inserted as a reminder to do this. The mention of a test suite
+         is usually right before the root user installation commands. Please
+         delete these 12 (including one blank) lines after you are done.-->
+
+    <!-- Use one of the two mentions below about a test suite,
+         delete the line that is not applicable. Of course, if the
+         test suite uses syntax other than "make check", revise the
+         line to reflect the actual syntax to run the test suite -->
+
+    <!-- <para>This package does not come with a test suite.</para> -->
+    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
+
+  <!ENTITY bc-download-http "&gnu-alpha-http;bc/bc-&bc-version;.tar.bz2">
+  <!ENTITY bc-download-ftp "&gnu-alpha-ftp;bc/bc-&bc-version;.tar.bz2">
+  <!ENTITY bc-md5sum "5126a721b73f97d715bb72c13c889035">
+  <!ENTITY bc-size "288 KB">
+  <!ENTITY bc-buildsize "3 MB">
+  <!ENTITY bc-time "less than 0.1 SBU (0.2 SBU if running the testsuite)">
+]>
+
+<sect1 id="bc" xreflabel="bc-&bc-version;">
+  <?dbhtml filename="bc.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>bc-&bc-version;</title>
+
+  <indexterm zone="bc">
+    <primary sortas="a-Bc">Bc</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to bc</title>
+
+    <para>The <application>bc</application> package contains
+    an arbitrary precision numeric processing language.</para>
+
+    <note><para>Starting with linux-3.9 the <command>bc</command>
+    program is needed to build the linux kernel.  It is been moved
+    to LFS for LFS-7.4.</para></note>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&bc-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&bc-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &bc-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &bc-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &bc-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &bc-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/bc"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Bc</title>
+
+    <para>Install <application>bc</application> by running the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr --with-readline &amp;&amp;
+make</userinput></screen>
+
+    <para>To test <application>bc</application>, run the commands below.
+    There is quite a bit of output, so you may want to redirect it to a file.
+    There are a very small percentage of tests (10 of 12,144) that will
+    indicate a roundoff error at the last digit.</para>
+
+<screen><userinput>echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+<!--
+    <para><command>sed -i '/PROTO.*readline/d' bc/scan.l</command>: This
+    command fixes the <application>Readline</application> library call.</para>
+
+    <para><command>sed -i '/flex -I8/s/8//' configure</command>: This
+    command fixes the <application>Flex</application> invocation.</para>
+
+    <para><command>sed -i '/stdlib/a #include &lt;string.h&gt;' lib/number.c</command>:
+    This command inserts a missing header.</para>
+
+    <para><command>sed -i 's/program.*save/static &amp;/' bc/load.c</command>:
+    This command fixes a segfault when running <application>bc</application>
+    with <command>bc -l</command>.</para>
+-->
+    <para><parameter>--with-readline</parameter>: This option enables
+    <application>Readline</application> support in interactive mode.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>bc and dc</seg>
+        <seg>None</seg>
+        <seg>None</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="bc-prog">
+        <term><command>bc</command></term>
+        <listitem>
+          <para>is a calculator.</para>
+          <indexterm zone="bc bc-prog">
+            <primary sortas="b-bc">bc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dc">
+        <term><command>dc</command></term>
+        <listitem>
+          <para>is a reverse-polish calculator.</para>
+          <indexterm zone="bc dc">
+            <primary sortas="b-dc">dc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
+
Index: archive/gamin.xml
===================================================================
--- archive/gamin.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/gamin.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY gamin-download-http
+    "http://www.gnome.org/~veillard/gamin/sources/gamin-&gamin-version;.tar.gz">
+  <!ENTITY gamin-download-ftp  "&gentoo-ftp-repo;/gamin-&gamin-version;.tar.gz">
+  <!ENTITY gamin-md5sum        "b4ec549e57da470c04edd5ec2876a028">
+  <!ENTITY gamin-size          "639 KB">
+  <!ENTITY gamin-buildsize     "6.7 MB">
+  <!ENTITY gamin-time          "0.1 SBU">
+]>
+
+<sect1 id="gamin" xreflabel="Gamin-&gamin-version;">
+  <?dbhtml filename="gamin.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Gamin-&gamin-version;</title>
+
+  <indexterm zone="gamin">
+    <primary sortas="a-Gamin">Gamin</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Gamin</title>
+
+    <para>
+      The <application>Gamin</application> package contains a File Alteration
+      Monitor which is useful for notifying applications of changes to the file
+      system. Gamin is compatible with
+      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>.
+    </para>
+
+    &lfs74_built;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&gamin-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&gamin-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &gamin-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &gamin-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &gamin-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &gamin-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Gamin Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="python2"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/gamin"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Gamin</title>
+
+    <para>
+      Install <application>Gamin</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>sed -i 's/G_CONST_RETURN/const/' server/gam_{node,subscription}.{c,h} &amp;&amp;
+./configure --prefix=/usr --libexecdir=/usr/sbin --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make check</command>. Note that some
+      tests may display errors.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install &amp;&amp;
+install -v -m755 -d /usr/share/doc/gamin-&gamin-version; &amp;&amp;
+install -v -m644 doc/*.{html,fig,gif,txt} /usr/share/doc/gamin-&gamin-version;</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <command>sed -i 's/G_CONST_RETURN/const/'
+      server/gam_{node,subscription}.{c,h}</command>: This sed fixes compiling
+      with <application>Glib 2.32</application> or greater installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring Gamin</title>
+
+    <sect3>
+      <title>Configuration Information</title>
+
+      <para>
+        No configuration is generally required and the default options should
+        work for most users. See
+        <ulink url="http://www.gnome.org/~veillard/gamin/config.html"/> for
+        details.
+      </para>
+    </sect3>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>gam_server</seg>
+        <seg>
+          libfam.so, libgamin-1.so, libgamin_shared.a and (if you've installed
+          <application>Python 2</application>) _gamin.so.
+        </seg>
+        <seg>/usr/share/doc/gamin-&gamin-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+    <varlistentry id="gam_server">
+      <term><command>gam_server</command></term>
+      <listitem>
+        <para>
+          is the file alteration monitor daemon that is started on demand for
+          each user.
+        </para>
+        <indexterm zone="gamin gam_server">
+          <primary sortas="b-gam_server">gam_server</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="libgamin">
+      <term><filename class='libraryfile'>libgamin.so</filename></term>
+      <listitem>
+        <para>
+          contains functions that support the file allocation monitor.
+        </para>
+        <indexterm zone="gamin libgamin">
+          <primary sortas="c-libgamin">libgamin.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry id="libfam">
+      <term><filename class='libraryfile'>libfam.so</filename></term>
+      <listitem>
+        <para>
+          contains functions that provide compatibility with FAM.
+        </para>
+        <indexterm zone="gamin libfam">
+          <primary sortas="c-libfam">libfam.so</primary>
+        </indexterm>
+      </listitem>
+    </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: archive/ibus.xml
===================================================================
--- archive/ibus.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/ibus.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY ibus-download-http "http://ibus.googlecode.com/files/ibus-&ibus-version;.tar.gz">
+  <!ENTITY ibus-download-ftp  " ">
+  <!ENTITY ibus-md5sum        "6ce27a692d2d4881e9898f3798dcf91c">
+  <!ENTITY ibus-size          "1.9 MB">
+  <!ENTITY ibus-buildsize     "40 MB">
+  <!ENTITY ibus-time          "0.5 SBU">
+]>
+
+<sect1 id="ibus" xreflabel="IBus-&ibus-version;">
+  <?dbhtml filename="ibus.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>IBus-&ibus-version;</title>
+
+  <indexterm zone="ibus">
+    <primary sortas="a-IBus">IBus</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to IBus</title>
+
+    <para>
+      <application>IBus</application> is an Intelligent Input Bus. It is a new
+      input framework for Linux OS. It provides full featured and user friendly
+      input method user interface.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&ibus-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&ibus-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &ibus-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &ibus-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &ibus-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &ibus-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">IBus Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="dconf"/> and
+      <xref linkend="iso-codes"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="gtk2"/>, 
+      <xref linkend="gtk3"/>, and
+      <xref linkend="vala"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="dbus-python"/>,
+      <xref linkend="gtk-doc"/>, and
+      <xref linkend="pyxdg"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/ibus"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of IBus</title>
+
+    <para>
+      Install <application>IBus</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib/ibus &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>make -k check</command>. Two
+      tests may fail due to problems with the tests.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--disable-gtk2</option>: This switch disables building
+      of the <application>GTK+ 2</application> immodule. Use it if
+      you have not installed <application>GTK+ 2</application>.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          ibus, ibus-daemon, and ibus-setup
+        </seg>
+        <seg>
+          libibus-1.0.so and im-ibus.so
+          (<application>GTK+ Immodule</application>)
+        </seg>
+        <seg>
+          /etc/dconf/db/ibus.d,
+          /usr/include/ibus-1.0,
+          /usr/lib/ibus,
+          /usr/share/gtk-doc/html/ibus, and
+          /usr/share/ibus
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="ibus-daemon">
+        <term><command>ibus-daemon</command></term>
+        <listitem>
+          <para>
+            is the Intelligent Input Bus Daemon.
+          </para>
+          <indexterm zone="ibus ibus-daemon">
+            <primary sortas="b-ibus-daemon">ibus-daemon</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ibus-setup">
+        <term><command>ibus-setup</command></term>
+        <listitem>
+          <para>
+            is the <application>GTK+</application> program used to configure
+            the <command>ibus-daemon</command>.
+          </para>
+          <indexterm zone="ibus ibus-setup">
+            <primary sortas="b-ibus-setup">ibus-setup</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libibus-1.0">
+        <term><filename class="libraryfile">libibus-1.0.so</filename></term>
+        <listitem>
+          <para>
+            contains <application>IBus</application> API functions.
+          </para>
+          <indexterm zone="ibus libibus-1.0">
+            <primary sortas="c-libibus-1.0">libibus-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/libidl.xml
===================================================================
--- archive/libidl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/libidl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libidl-download-http "&gnome-download-http;/libIDL/0.8/libIDL-&libidl-version;.tar.bz2">
+  <!ENTITY libidl-download-ftp  "&gnome-download-ftp;/libIDL/0.8/libIDL-&libidl-version;.tar.bz2">
+  <!ENTITY libidl-md5sum        "bb8e10a218fac793a52d404d14adedcb">
+  <!ENTITY libidl-size          "417 KB">
+  <!ENTITY libidl-buildsize     "5 MB">
+  <!ENTITY libidl-time          "0.1 SBU">
+]>
+
+<sect1 id="libidl" xreflabel="libIDL-&libidl-version;">
+  <?dbhtml filename="libidl.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>LibIDL-&libidl-version;</title>
+
+  <indexterm zone="libidl">
+    <primary sortas="a-LibIDL">LibIDL</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to LibIDL</title>
+
+    <para>The <application>libIDL</application> package
+    contains libraries for Interface Definition Language files. This is a
+    specification for defining portable interfaces.</para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libidl-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libidl-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libidl-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libidl-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libidl-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libidl-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">LibIDL Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="glib2"/></para>
+
+    <bridgehead renderas="sect4">Optional to Build Documentation</bridgehead>
+    <para role="optional">
+    <xref linkend="texlive"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libidl"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of LibIDL</title>
+
+    <para>Install <application>libIDL</application> by running
+    the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+
+makeinfo --plaintext -o libIDL2.txt libIDL2.texi</userinput></screen>
+
+    <para>If you have
+    <application>Live TeX</application> installed and wish to
+    build alternate forms of the documentation, issue the following
+    command:</para>
+
+<screen><userinput>make pdf ps</userinput></screen>
+
+    <para>This package does not come with a test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install
+
+install -v -m755 -d /usr/share/doc/libIDL-&libidl-version; &amp;&amp;
+install -v -m644    README libIDL2.{txt,texi} \
+                    /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
+
+    <para>If you built the additional documentation, issue the following
+    command as the <systemitem class="username">root</systemitem> user to
+    install it:</para>
+
+<screen role="root"><userinput>install -v -m644 libIDL2.{pdf,dvi,ps} \
+                 /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>libIDL-config-2</seg>
+        <seg>libIDL-2.{so,a}</seg>
+        <seg>/usr/include/libIDL-2.0/libIDL and
+        /usr/share/doc/libIDL-&libidl-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libIDL-config-2">
+        <term><command>libIDL-config-2</command></term>
+        <listitem>
+          <para>determines the compile and linker flags that should be used to
+          compile and link programs that use
+          <filename class="libraryfile">libIDL-2</filename>.</para>
+          <indexterm zone="libidl libIDL-config-2">
+            <primary sortas="b-libIDL-config-2">libIDL-config-2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libIDL-2">
+        <term><filename class="libraryfile">libIDL-2.{so,a}</filename></term>
+        <listitem>
+          <para>libraries provide the functions to create and maintain
+          trees of CORBA Interface Definition Language
+          (IDL) files.</para>
+          <indexterm zone="libidl libIDL-2">
+            <primary sortas="c-libIDL-2">libIDL-2.{so,a}</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/notify-python.xml
===================================================================
--- archive/notify-python.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/notify-python.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY notify-python-download-http
+           "http://www.galago-project.org/files/releases/source/notify-python/notify-python-&notify-python-version;.tar.bz2">
+  <!ENTITY notify-python-download-ftp  " ">
+  <!ENTITY notify-python-md5sum        "d247cf79b46cef7495deb0a76334f81d">
+  <!ENTITY notify-python-size          "212 KB">
+  <!ENTITY notify-python-buildsize     "2.3 MB">
+  <!ENTITY notify-python-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Notify Python -->
+  <sect2 id="notify-python" xreflabel="Notify Python-&notify-python-version;">
+
+    <title>Notify Python-&notify-python-version;</title>
+
+    <indexterm zone="notify-python">
+      <primary sortas="a-notify-python">notify-python</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Notify Python Module</title>
+
+      <para>
+        Notify Python provides <application>Python 2</application>
+        bindings to the <application>libnotify</application>.
+      </para>
+
+      &lfs74_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&notify-python-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&notify-python-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &notify-python-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &notify-python-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &notify-python-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &notify-python-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/notify-python-&notify-python-version;-libnotify-0.7-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+      <bridgehead renderas="sect4">Notify Python Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="libnotify"/> and
+        <xref linkend="pygtk"/> (with <xref linkend="gtk2"/> support).
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/notify-python"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Notify Python</title>
+
+      <para>
+        Install <application>Notify Python</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>patch -Np1 -i ../notify-python-&notify-python-version;-libnotify-0.7-1.patch &amp;&amp;
+./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        This package does not come with a testsuite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directory</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/pynotify
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+    </sect3>
+  </sect2>
+  <!-- End Notify Python -->
Index: archive/pkgconfig.xml
===================================================================
--- archive/pkgconfig.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/pkgconfig.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY pkgconfig-download-http "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
+  <!ENTITY pkgconfig-download-ftp  "">
+  <!ENTITY pkgconfig-md5sum        "aa3c86e67551adc3ac865160e34a2a0d">
+  <!ENTITY pkgconfig-size          "1.9 MB">
+  <!ENTITY pkgconfig-buildsize     "30 MB">
+  <!ENTITY pkgconfig-time          "0.3 SBU">
+]>
+
+<sect1 id="pkgconfig" xreflabel="pkg-config-&pkgconfig-version;">
+  <?dbhtml filename="pkgconfig.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>pkg-config-&pkgconfig-version;</title>
+
+  <indexterm zone="pkgconfig">
+    <primary sortas="a-pkg-config">pkg-config</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to pkg-config</title>
+
+    <para>
+      The <application>pkg-config</application> package contains a tool for
+      passing the include path and/or library paths to build tools during the
+      <command>configure</command> and <command>make</command> file execution.
+    </para>
+
+    &lfs74_checked;
+
+    <note>
+      <para>
+        Pkg-config is part of LFS, but was omitted from  the 7.0 and 7.1
+        releases. If you are using a system which includes it, there is
+        nothing more to do. If not, you should follow these instructions.
+      </para>
+    </note>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&pkgconfig-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&pkgconfig-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &pkgconfig-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &pkgconfig-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &pkgconfig-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &pkgconfig-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/pkgconfig"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of pkg-config</title>
+
+    <para>
+      Install <application>pkg-config</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr        \
+            --with-internal-glib \
+            --disable-host-tool  \
+            --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; &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>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--with-internal-glib</option>: This switch causes
+      the package to use the shipped version of GLib2.
+    </para>
+
+    <para>
+      <option>--disable-host-tool</option>: This switch disables
+      creation of the unnecessary symlink.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuring pkg-config</title>
+
+    <para>
+      The default setting for <envar>PKG_CONFIG_PATH</envar> is <filename
+      class="directory">/usr/lib/pkgconfig:/usr/share/pkgconfig</filename>
+      because of the prefix used to install
+      <application>pkg-config</application>. You may add to
+      <envar>PKG_CONFIG_PATH</envar> by exporting additional paths on your system
+      where <filename class="extension">.pc</filename> files are installed. Note
+      that <envar>PKG_CONFIG_PATH</envar> is only needed when compiling packages,
+      not during run-time.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          pkg-config
+        </seg>
+        <seg>
+          None
+        </seg>
+        <seg>
+          None
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="pkg-config">
+        <term><command>pkg-config</command></term>
+        <listitem>
+          <para>
+            returns meta information for the specified library or
+            package.
+          </para>
+          <indexterm zone="pkgconfig pkg-config">
+            <primary sortas="b-pkg-config">pkg-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: archive/slib.xml
===================================================================
--- archive/slib.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/slib.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY slib-download-http
+  "http://groups.csail.mit.edu/mac/ftpdir/scm/slib-&slib-version;.tar.gz">
+  <!ENTITY slib-download-ftp  " ">
+  <!ENTITY slib-md5sum        "dcada65c4df4209c8f71211095bcef8e">
+  <!ENTITY slib-size          "956 KB">
+  <!ENTITY slib-buildsize     "10 MB (includes building and installing docs)">
+  <!ENTITY slib-time          "0.5 SBU">
+]>
+
+<sect1 id="slib" xreflabel="SLIB-&slib-version;">
+  <?dbhtml filename="slib.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>SLIB-&slib-version;</title>
+
+  <indexterm zone="slib">
+    <primary sortas="a-SLIB">SLIB</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to SLIB</title>
+
+    <para>The <application>SLIB</application> package is a portable library for
+    the <application>Scheme</application> programming language. It provides a
+    platform independent framework for using <quote>packages</quote> of
+    <application>Scheme</application> procedures and syntax.
+    Its catalog can be transparently extended to accommodate packages specific
+    to a site, implementation, user or directory. SLIB provides compatibility
+    and utility functions for all standard Scheme implementations including
+    Bigloo, Chez, ELK 3.0, GAMBIT 3.0, Guile, JScheme, MacScheme, MITScheme,
+    PLT Scheme (DrScheme and MzScheme), Pocket Scheme, RScheme, scheme->C,
+    Scheme48, SCM, SCM Mac, scsh, Stk, T3.1, umb-scheme, and VSCM.</para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&slib-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&slib-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &slib-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &slib-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &slib-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &slib-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">SLIB Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="guile"/>.</para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/slib"/></para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of SLIB</title>
+
+    <para>Install <application>SLIB</application> by issuing the following
+    commands:</para>
+
+<screen><userinput>sed -i 's|usr/lib|usr/share|' RScheme.init                      &amp;&amp;
+./configure --prefix=/usr --libdir=/usr/share                   &amp;&amp;
+
+sed -i -e 's# scm$# guile#;s#ginstall-info#install-info#' \
+       -e 's/no-split -o/no-split --force -o/' Makefile         &amp;&amp;
+
+makeinfo -o slib.txt --plaintext --force slib.texi              &amp;&amp;
+makeinfo -o slib.html --html --no-split --force slib.texi</userinput></screen>
+
+<!-- Thee are errors in slib.texi
+    <para>If you have <xref linkend="texlive"/> installed and wish to build PDF
+    or Postscript documentation, issue any or all of the following
+    commands:</para>
+
+<screen><userinput>texi2pdf slib.texi &amp;&amp;
+texi2dvi slib.texi &amp;&amp;
+dvips -o slib.ps slib.dvi</userinput></screen>
+-->
+    <para>This package does not come with a functional test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen role="root"><userinput>make install                                            &amp;&amp;
+ln -v -sf ../slib /usr/share/guile                      &amp;&amp;
+mkdir -pv /usr/share/guile/site/2.0                     &amp;&amp;
+guile -c "(use-modules (ice-9 slib)) (require 'printf)" &amp;&amp;
+install -v -m755 -d /usr/share/doc/slib-&slib-version;             &amp;&amp;
+install -v -m644 ANNOUNCE FAQ README slib.{txt,html} /usr/share/doc/slib-&slib-version;</userinput></screen>
+
+<!--
+    <para>If you built any of the optional documentation, install it using the
+    following command as the <systemitem class="username">root</systemitem>
+    user:</para>
+
+<screen role="root"><userinput>install -v -m644 slib.{pdf,dvi,ps} /usr/share/doc/slib-&slib-version;</userinput></screen>
+ -->
+ </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i 's|usr/lib|usr/share|' RScheme.init</command>:
+    This command is used to change the <envar>libdir</envar> variable embedded
+    in the script to match the installation.</para>
+
+    <para><option>--libdir=/usr/share</option>: This option puts the installed
+    in files <filename class="directory">/usr/share/slib</filename> instead of
+    <filename class="directory">/usr/lib/slib</filename>.</para>
+
+    <para><command>makeinfo ... --force ... </command>: This command creates
+    needed documentation, but needs the <option>--force</option> option to
+    overcome warnings that are flagged as errors in recent versions of
+    <command>makeinfo</command>.</para>
+
+    <para><command>ln -v -sf ../slib /usr/share/guile</command>: This command
+    puts a symbolic link to the <application>slib</application> files in
+    <application>Guile</application>'s default <quote>Implementation
+    Vicinity</quote>.</para>
+
+    <para><command>guile -c "(use-modules (ice-9 slib)) (require
+    'printf)"</command>: This command creates a guile catalog of the
+    <application>slib</application> files.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>slib</seg>
+        <seg>a <application>Scheme</application> library system</seg>
+        <seg>/usr/share/slib, 
+             /usr/share/guile/site/2.0, and 
+             /usr/share/doc/slib-&slib-version;</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="slib-prog">
+        <term><command>slib</command></term>
+        <listitem>
+          <para>is a shell script used to initialize
+          <application>SLIB</application> in a named
+          <application>Scheme</application> implementation. It can also be
+          used to initialize an <application>SLIB</application> session using
+          a given executable.</para>
+          <indexterm zone="slib slib-prog">
+            <primary sortas="b-slib">slib</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </sect2>
+</sect1>
Index: archive/udev.xml
===================================================================
--- archive/udev.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
+++ archive/udev.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!-- <!ENTITY udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2"> -->
+  <!ENTITY udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/">
+  <!ENTITY udev-download-ftp  " ">
+  <!-- <!ENTITY udev-md5sum        "aeae0e6273dcbec246c3c1b9868ebed1"> -->
+  <!ENTITY udev-size          "~500 KB">
+  <!ENTITY udev-buildsize     "~10 MB">
+  <!ENTITY udev-time          "~1.8 SBU">
+]>
+
+<sect1 id="udev" xreflabel="udev-&udev-version;">
+  <?dbhtml filename="udev.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Udev-&udev-version;</title>
+
+  <indexterm zone="udev">
+    <primary sortas="a-udev">udev</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Udev</title>
+
+    <note><para>If you installed LFS from SVN-20120719, LFS-7.2, or later,
+    use <xref linkend='udev-extras'/> instead of this page.</para></note>
+
+    <para><application>Udev</application> was indeed installed in LFS and there
+    is no reason to reinstall it unless you are going to install a package such
+    as <application>UPower</application>. This installation of
+    <application>Udev</application> enables extra features which includes
+    <application>gudev</application>, a requirement for
+    <application>UPower</application> and optionally used by other
+    packages.</para>
+
+    <para>Unlike any other package in the BLFS book, there is no set version
+    of <application>Udev</application> specified to download. Several version
+    updates to LFS and none to BLFS means there are probably many different
+    versions of <application>Udev</application> on the platforms that BLFS is
+    being built upon. Therefore, you should download and use the version of
+    <application>Udev</application> your computer currently uses. The BLFS
+    team has no experience updating (or reverting to an older version) the
+    <application>Udev</application> package <quote>on the fly.</quote> To
+    discover the version of <application>Udev</application> your computer
+    currently uses, issue <command>/sbin/udevadm --version</command>.</para>
+
+    <para>You should look at the LFS instructions for the version you used, to
+    check that you are using the correct testfiles (for some versions, this was a
+    separate tarball, extracted in the udev directory with --strip-components=1)
+    and to compare the configure options you are about to use against those which
+    you used to build the version you are running (sometimes, the options change).
+    </para>
+
+    <para>This package is known to build and work properly using an LFS-7.0
+    platform. (Using Udev-173)</para>
+
+    <para>This package is known to build and work properly using an LFS-7.1
+    platform. (Using Udev-182)</para>
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&udev-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&udev-download-ftp;"/></para>
+      </listitem>
+      <!-- <listitem>
+        <para>Download MD5 sum: &udev-md5sum;</para>
+      </listitem> -->
+      <listitem>
+        <para>Download size: &udev-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &udev-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &udev-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Udev Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required"><xref linkend="acl"/>,
+    <xref linkend="glib2"/>,
+    <xref linkend="gperf"/>,
+    <xref linkend="pciutils"/>, and
+    <xref linkend="usbutils"/></para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional"><xref linkend="gobject-introspection"/></para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/udev"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Udev</title>
+
+    <para>Install <application>Udev</application> by running the following
+    commands:</para>
+
+<screen><userinput>./configure --prefix=/usr                  \
+            --sysconfdir=/etc              \
+            --sbindir=/sbin                \
+            --with-rootlibdir=/lib         \
+            --libexecdir=/lib              \
+            --with-systemdsystemunitdir=no \
+            --disable-introspection        \
+            --docdir=/usr/share/doc/&lt;udev-&udev-version;&gt; &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>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+    <para><option>--disable-introspection</option>: Remove this option if
+    the optional dependency gobject-introspection is installed.</para>
+
+    <para><option>--with-systemdsystemunitdir=no</option>: systemd is not used
+    in (B)LFS.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <para>A list of the installed files, along with their short descriptions
+    can be found at
+    <ulink url="&lfs-root;/chapter06/udev.html#contents-udev"/>.</para>
+
+    <para>The following is some additional content information.</para>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>findkeyboards, firmware, input_id,
+        keyboard-force-release.sh, keymap, modem-modeswitch, pci-db, udev-acl,
+        usb-db, and v4l_id</seg>
+        <seg>libgudev-1.0.so</seg>
+        <seg>/lib/udev/keymaps/force-release,
+        /usr/{include/gudev-1.0/gudev,share/{doc/udev-&udev-version;,
+        gtk-doc/html/gudev}}</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="keymap">
+        <term><command>keymap</command></term>
+        <listitem>
+          <para>configures computer model specific key mappings.</para>
+          <indexterm zone="udev keymap">
+            <primary sortas="b-keymap">keymap</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgudev-1.0">
+        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
+        <listitem>
+          <para>is a GObject-based wrapper library for libudev.</para>
+          <indexterm zone="udev libgudev-1.0">
+            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genlib/apr.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -6,7 +6,7 @@
 
   <!ENTITY apr-download-http
-  "http://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
+    "http://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
   <!ENTITY apr-download-ftp
-  "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-&apr-version;.tar.bz2">
+    "ftp://ftp.mirrorservice.org/sites/ftp.apache.org/apr/apr-&apr-version;.tar.bz2">
   <!ENTITY apr-md5sum        "ce2ab01a0c3cdb71cf0a6326b8654f41">
   <!ENTITY apr-size          "760 KB">
@@ -89,6 +89,7 @@
     </para>
 
-<screen><userinput>./configure -&#45;prefix=/usr -&#45;disable-static \
-  -&#45;with-installbuilddir=/usr/share/apr-1/build &amp;&amp;
+<screen><userinput>./configure --prefix=/usr    \
+            --disable-static \
+            --with-installbuilddir=/usr/share/apr-1/build &amp;&amp;
 make</userinput></screen>
 
@@ -107,8 +108,6 @@
     <title>Command Explanations</title>
 
-    <para>
-      <option>-&#45;disable-static</option>: This stops it from compiling a static
-      version of <filename class="libraryfile">libapr-1</filename>.
-    </para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
 
   </sect2>
@@ -123,7 +122,14 @@
 
       <seglistitem>
-        <seg>apr-1-config</seg>
-        <seg>libapr-1.so</seg>
-        <seg>/usr/include/apr-1 and /usr/share/apr-1</seg>
+        <seg>
+          apr-1-config
+        </seg>
+        <seg>
+          libapr-1.so
+        </seg>
+        <seg>
+          /usr/include/apr-1 and 
+          /usr/share/apr-1
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -160,4 +166,5 @@
       </varlistentry>
     </variablelist>
+
   </sect2>
 </sect1>
Index: neral/genlib/gamin.xml
===================================================================
--- general/genlib/gamin.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY gamin-download-http
-    "http://www.gnome.org/~veillard/gamin/sources/gamin-&gamin-version;.tar.gz">
-  <!ENTITY gamin-download-ftp  "&gentoo-ftp-repo;/gamin-&gamin-version;.tar.gz">
-  <!ENTITY gamin-md5sum        "b4ec549e57da470c04edd5ec2876a028">
-  <!ENTITY gamin-size          "639 KB">
-  <!ENTITY gamin-buildsize     "6.7 MB">
-  <!ENTITY gamin-time          "0.1 SBU">
-]>
-
-<sect1 id="gamin" xreflabel="Gamin-&gamin-version;">
-  <?dbhtml filename="gamin.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Gamin-&gamin-version;</title>
-
-  <indexterm zone="gamin">
-    <primary sortas="a-Gamin">Gamin</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gamin</title>
-
-    <para>
-      The <application>Gamin</application> package contains a File Alteration
-      Monitor which is useful for notifying applications of changes to the file
-      system. Gamin is compatible with
-      <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>.
-    </para>
-
-    &lfs74_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gamin-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gamin-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gamin-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gamin-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gamin-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gamin-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gamin Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/gamin"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gamin</title>
-
-    <para>
-      Install <application>Gamin</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's/G_CONST_RETURN/const/' server/gam_{node,subscription}.{c,h} &amp;&amp;
-./configure --prefix=/usr --libexecdir=/usr/sbin --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that some
-      tests may display errors.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/gamin-&gamin-version; &amp;&amp;
-install -v -m644 doc/*.{html,fig,gif,txt} /usr/share/doc/gamin-&gamin-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's/G_CONST_RETURN/const/'
-      server/gam_{node,subscription}.{c,h}</command>: This sed fixes compiling
-      with <application>Glib 2.32</application> or greater installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Gamin</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        No configuration is generally required and the default options should
-        work for most users. See
-        <ulink url="http://www.gnome.org/~veillard/gamin/config.html"/> for
-        details.
-      </para>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>gam_server</seg>
-        <seg>
-          libfam.so, libgamin-1.so, libgamin_shared.a and (if you've installed
-          <application>Python 2</application>) _gamin.so.
-        </seg>
-        <seg>/usr/share/doc/gamin-&gamin-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <varlistentry id="gam_server">
-      <term><command>gam_server</command></term>
-      <listitem>
-        <para>
-          is the file alteration monitor daemon that is started on demand for
-          each user.
-        </para>
-        <indexterm zone="gamin gam_server">
-          <primary sortas="b-gam_server">gam_server</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libgamin">
-      <term><filename class='libraryfile'>libgamin.so</filename></term>
-      <listitem>
-        <para>
-          contains functions that support the file allocation monitor.
-        </para>
-        <indexterm zone="gamin libgamin">
-          <primary sortas="c-libgamin">libgamin.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry id="libfam">
-      <term><filename class='libraryfile'>libfam.so</filename></term>
-      <listitem>
-        <para>
-          contains functions that provide compatibility with FAM.
-        </para>
-        <indexterm zone="gamin libfam">
-          <primary sortas="c-libfam">libfam.so</primary>
-        </indexterm>
-      </listitem>
-    </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genlib/genlib.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -53,5 +53,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gamin.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
@@ -75,5 +74,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
@@ -81,5 +79,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
@@ -104,5 +101,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qjson.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sbc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="talloc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genlib/glib2.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libffi"/>,
-      <xref linkend="pkgconfig"/>, and
+      <xref linkend="libffi"/> and
       <xref linkend="python2"/>
     </para>
Index: general/genlib/libgusb.xml
===================================================================
--- general/genlib/libgusb.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genlib/libgusb.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -78,5 +78,4 @@
     <para role="required">
       <xref linkend="libusb"/> and
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev)
     </para>
Index: neral/genlib/libidl.xml
===================================================================
--- general/genlib/libidl.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY libidl-download-http "&gnome-download-http;/libIDL/0.8/libIDL-&libidl-version;.tar.bz2">
-  <!ENTITY libidl-download-ftp  "&gnome-download-ftp;/libIDL/0.8/libIDL-&libidl-version;.tar.bz2">
-  <!ENTITY libidl-md5sum        "bb8e10a218fac793a52d404d14adedcb">
-  <!ENTITY libidl-size          "417 KB">
-  <!ENTITY libidl-buildsize     "5 MB">
-  <!ENTITY libidl-time          "0.1 SBU">
-]>
-
-<sect1 id="libidl" xreflabel="libIDL-&libidl-version;">
-  <?dbhtml filename="libidl.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>LibIDL-&libidl-version;</title>
-
-  <indexterm zone="libidl">
-    <primary sortas="a-LibIDL">LibIDL</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LibIDL</title>
-
-    <para>The <application>libIDL</application> package
-    contains libraries for Interface Definition Language files. This is a
-    specification for defining portable interfaces.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libidl-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libidl-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libidl-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libidl-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libidl-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libidl-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">LibIDL Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="glib2"/></para>
-
-    <bridgehead renderas="sect4">Optional to Build Documentation</bridgehead>
-    <para role="optional">
-    <xref linkend="texlive"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libidl"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LibIDL</title>
-
-    <para>Install <application>libIDL</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-
-makeinfo --plaintext -o libIDL2.txt libIDL2.texi</userinput></screen>
-
-    <para>If you have
-    <application>Live TeX</application> installed and wish to
-    build alternate forms of the documentation, issue the following
-    command:</para>
-
-<screen><userinput>make pdf ps</userinput></screen>
-
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install
-
-install -v -m755 -d /usr/share/doc/libIDL-&libidl-version; &amp;&amp;
-install -v -m644    README libIDL2.{txt,texi} \
-                    /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
-
-    <para>If you built the additional documentation, issue the following
-    command as the <systemitem class="username">root</systemitem> user to
-    install it:</para>
-
-<screen role="root"><userinput>install -v -m644 libIDL2.{pdf,dvi,ps} \
-                 /usr/share/doc/libIDL-&libidl-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>libIDL-config-2</seg>
-        <seg>libIDL-2.{so,a}</seg>
-        <seg>/usr/include/libIDL-2.0/libIDL and
-        /usr/share/doc/libIDL-&libidl-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libIDL-config-2">
-        <term><command>libIDL-config-2</command></term>
-        <listitem>
-          <para>determines the compile and linker flags that should be used to
-          compile and link programs that use
-          <filename class="libraryfile">libIDL-2</filename>.</para>
-          <indexterm zone="libidl libIDL-config-2">
-            <primary sortas="b-libIDL-config-2">libIDL-config-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libIDL-2">
-        <term><filename class="libraryfile">libIDL-2.{so,a}</filename></term>
-        <listitem>
-          <para>libraries provide the functions to create and maintain
-          trees of CORBA Interface Definition Language
-          (IDL) files.</para>
-          <indexterm zone="libidl libIDL-2">
-            <primary sortas="c-libIDL-2">libIDL-2.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libusb-compat.xml
===================================================================
--- general/genlib/libusb-compat.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genlib/libusb-compat.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libusb"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="libusb"/>
     </para>
 
Index: general/genlib/ptlib.xml
===================================================================
--- general/genlib/ptlib.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genlib/ptlib.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -84,9 +84,4 @@
 
     <bridgehead renderas="sect3">Ptlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pkgconfig"/>
-    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
Index: neral/genlib/slib.xml
===================================================================
--- general/genlib/slib.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY slib-download-http
-  "http://groups.csail.mit.edu/mac/ftpdir/scm/slib-&slib-version;.tar.gz">
-  <!ENTITY slib-download-ftp  " ">
-  <!ENTITY slib-md5sum        "dcada65c4df4209c8f71211095bcef8e">
-  <!ENTITY slib-size          "956 KB">
-  <!ENTITY slib-buildsize     "10 MB (includes building and installing docs)">
-  <!ENTITY slib-time          "0.5 SBU">
-]>
-
-<sect1 id="slib" xreflabel="SLIB-&slib-version;">
-  <?dbhtml filename="slib.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>SLIB-&slib-version;</title>
-
-  <indexterm zone="slib">
-    <primary sortas="a-SLIB">SLIB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SLIB</title>
-
-    <para>The <application>SLIB</application> package is a portable library for
-    the <application>Scheme</application> programming language. It provides a
-    platform independent framework for using <quote>packages</quote> of
-    <application>Scheme</application> procedures and syntax.
-    Its catalog can be transparently extended to accommodate packages specific
-    to a site, implementation, user or directory. SLIB provides compatibility
-    and utility functions for all standard Scheme implementations including
-    Bigloo, Chez, ELK 3.0, GAMBIT 3.0, Guile, JScheme, MacScheme, MITScheme,
-    PLT Scheme (DrScheme and MzScheme), Pocket Scheme, RScheme, scheme->C,
-    Scheme48, SCM, SCM Mac, scsh, Stk, T3.1, umb-scheme, and VSCM.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&slib-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&slib-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &slib-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &slib-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &slib-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &slib-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SLIB Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="guile"/>.</para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/slib"/></para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SLIB</title>
-
-    <para>Install <application>SLIB</application> by issuing the following
-    commands:</para>
-
-<screen><userinput>sed -i 's|usr/lib|usr/share|' RScheme.init                      &amp;&amp;
-./configure --prefix=/usr --libdir=/usr/share                   &amp;&amp;
-
-sed -i -e 's# scm$# guile#;s#ginstall-info#install-info#' \
-       -e 's/no-split -o/no-split --force -o/' Makefile         &amp;&amp;
-
-makeinfo -o slib.txt --plaintext --force slib.texi              &amp;&amp;
-makeinfo -o slib.html --html --no-split --force slib.texi</userinput></screen>
-
-<!-- Thee are errors in slib.texi
-    <para>If you have <xref linkend="texlive"/> installed and wish to build PDF
-    or Postscript documentation, issue any or all of the following
-    commands:</para>
-
-<screen><userinput>texi2pdf slib.texi &amp;&amp;
-texi2dvi slib.texi &amp;&amp;
-dvips -o slib.ps slib.dvi</userinput></screen>
--->
-    <para>This package does not come with a functional test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>make install                                            &amp;&amp;
-ln -v -sf ../slib /usr/share/guile                      &amp;&amp;
-mkdir -pv /usr/share/guile/site/2.0                     &amp;&amp;
-guile -c "(use-modules (ice-9 slib)) (require 'printf)" &amp;&amp;
-install -v -m755 -d /usr/share/doc/slib-&slib-version;             &amp;&amp;
-install -v -m644 ANNOUNCE FAQ README slib.{txt,html} /usr/share/doc/slib-&slib-version;</userinput></screen>
-
-<!--
-    <para>If you built any of the optional documentation, install it using the
-    following command as the <systemitem class="username">root</systemitem>
-    user:</para>
-
-<screen role="root"><userinput>install -v -m644 slib.{pdf,dvi,ps} /usr/share/doc/slib-&slib-version;</userinput></screen>
- -->
- </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i 's|usr/lib|usr/share|' RScheme.init</command>:
-    This command is used to change the <envar>libdir</envar> variable embedded
-    in the script to match the installation.</para>
-
-    <para><option>--libdir=/usr/share</option>: This option puts the installed
-    in files <filename class="directory">/usr/share/slib</filename> instead of
-    <filename class="directory">/usr/lib/slib</filename>.</para>
-
-    <para><command>makeinfo ... --force ... </command>: This command creates
-    needed documentation, but needs the <option>--force</option> option to
-    overcome warnings that are flagged as errors in recent versions of
-    <command>makeinfo</command>.</para>
-
-    <para><command>ln -v -sf ../slib /usr/share/guile</command>: This command
-    puts a symbolic link to the <application>slib</application> files in
-    <application>Guile</application>'s default <quote>Implementation
-    Vicinity</quote>.</para>
-
-    <para><command>guile -c "(use-modules (ice-9 slib)) (require
-    'printf)"</command>: This command creates a guile catalog of the
-    <application>slib</application> files.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>slib</seg>
-        <seg>a <application>Scheme</application> library system</seg>
-        <seg>/usr/share/slib, 
-             /usr/share/guile/site/2.0, and 
-             /usr/share/doc/slib-&slib-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="slib-prog">
-        <term><command>slib</command></term>
-        <listitem>
-          <para>is a shell script used to initialize
-          <application>SLIB</application> in a named
-          <application>Scheme</application> implementation. It can also be
-          used to initialize an <application>SLIB</application> session using
-          a given executable.</para>
-          <indexterm zone="slib slib-prog">
-            <primary sortas="b-slib">slib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: neral/genutils/bc.xml
===================================================================
--- general/genutils/bc.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,167 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-    <!-- Inserted as a reminder to do this. The mention of a test suite
-         is usually right before the root user installation commands. Please
-         delete these 12 (including one blank) lines after you are done.-->
-
-    <!-- Use one of the two mentions below about a test suite,
-         delete the line that is not applicable. Of course, if the
-         test suite uses syntax other than "make check", revise the
-         line to reflect the actual syntax to run the test suite -->
-
-    <!-- <para>This package does not come with a test suite.</para> -->
-    <!-- <para>To test the results, issue: <command>make check</command>.</para> -->
-
-  <!ENTITY bc-download-http "&gnu-alpha-http;bc/bc-&bc-version;.tar.bz2">
-  <!ENTITY bc-download-ftp "&gnu-alpha-ftp;bc/bc-&bc-version;.tar.bz2">
-  <!ENTITY bc-md5sum "5126a721b73f97d715bb72c13c889035">
-  <!ENTITY bc-size "288 KB">
-  <!ENTITY bc-buildsize "3 MB">
-  <!ENTITY bc-time "less than 0.1 SBU (0.2 SBU if running the testsuite)">
-]>
-
-<sect1 id="bc" xreflabel="bc-&bc-version;">
-  <?dbhtml filename="bc.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>bc-&bc-version;</title>
-
-  <indexterm zone="bc">
-    <primary sortas="a-Bc">Bc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to bc</title>
-
-    <para>The <application>bc</application> package contains
-    an arbitrary precision numeric processing language.</para>
-
-    <note><para>Starting with linux-3.9 the <command>bc</command>
-    program is needed to build the linux kernel.  It is been moved
-    to LFS for LFS-7.4.</para></note>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&bc-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&bc-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &bc-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &bc-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &bc-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &bc-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/bc"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bc</title>
-
-    <para>Install <application>bc</application> by running the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr --with-readline &amp;&amp;
-make</userinput></screen>
-
-    <para>To test <application>bc</application>, run the commands below.
-    There is quite a bit of output, so you may want to redirect it to a file.
-    There are a very small percentage of tests (10 of 12,144) that will
-    indicate a roundoff error at the last digit.</para>
-
-<screen><userinput>echo "quit" | ./bc/bc -l Test/checklib.b</userinput></screen>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para><command>sed -i '/PROTO.*readline/d' bc/scan.l</command>: This
-    command fixes the <application>Readline</application> library call.</para>
-
-    <para><command>sed -i '/flex -I8/s/8//' configure</command>: This
-    command fixes the <application>Flex</application> invocation.</para>
-
-    <para><command>sed -i '/stdlib/a #include &lt;string.h&gt;' lib/number.c</command>:
-    This command inserts a missing header.</para>
-
-    <para><command>sed -i 's/program.*save/static &amp;/' bc/load.c</command>:
-    This command fixes a segfault when running <application>bc</application>
-    with <command>bc -l</command>.</para>
--->
-    <para><parameter>--with-readline</parameter>: This option enables
-    <application>Readline</application> support in interactive mode.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>bc and dc</seg>
-        <seg>None</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bc-prog">
-        <term><command>bc</command></term>
-        <listitem>
-          <para>is a calculator.</para>
-          <indexterm zone="bc bc-prog">
-            <primary sortas="b-bc">bc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dc">
-        <term><command>dc</command></term>
-        <listitem>
-          <para>is a reverse-polish calculator.</para>
-          <indexterm zone="bc dc">
-            <primary sortas="b-dc">dc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
-
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genutils/genutils.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -21,5 +21,4 @@
   PIN numbers and pass-phrases, and a hash generator.</para>
 
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="compface.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="desktop-file-utils.xml"/>
Index: general/genutils/gtk-doc.xml
===================================================================
--- general/genutils/gtk-doc.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genutils/gtk-doc.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -72,8 +72,4 @@
       <xref linkend="libxslt"/>
     </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pkgconfig"/>
-    (to use some of the optional deps)</para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genutils/imagemagick.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -124,5 +124,4 @@
     <bridgehead renderas="sect4">Optional System Utilities</bridgehead>
     <para role="optional">
-      <xref linkend="pkgconfig"/>,
       <xref linkend="cups"/>,
       <xref linkend="curl"/>,
Index: general/genutils/rxvt-unicode.xml
===================================================================
--- general/genutils/rxvt-unicode.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genutils/rxvt-unicode.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -61,14 +61,14 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="x-window-system"/></para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="pkgconfig"/></para>
+    <para role="required">
+      <xref linkend="x-window-system"/>
+    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="gdk-pixbuf"/>, or <ulink
-    url="http://sourceforge.net/projects/afterstep">libAfterImage</ulink>
-    (these add support for background images and simulated transparency)</para>
+      <xref linkend="gdk-pixbuf"/>, or 
+      <ulink url="http://sourceforge.net/projects/afterstep">libAfterImage</ulink>
+      (these add support for background images and simulated transparency)
+    </para>
 
     <para condition="html" role="usernotes">User Notes:
Index: general/genutils/xscreensaver.xml
===================================================================
--- general/genutils/xscreensaver.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/genutils/xscreensaver.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -82,5 +82,4 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="bc"/>,
       <xref linkend="libglade"/> and
       <xref linkend="xorg7-app"/>
Index: general/graphlib/babl.xml
===================================================================
--- general/graphlib/babl.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/graphlib/babl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -74,9 +74,4 @@
 
     <bridgehead renderas="sect3">Babl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="pkgconfig"/>
-    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: general/graphlib/openjpeg.xml
===================================================================
--- general/graphlib/openjpeg.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/graphlib/openjpeg.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -67,9 +67,4 @@
 -->
     <bridgehead renderas="sect3">OpenJPEG Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="pkgconfig"/>
-    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: neral/prog/notify-python.xml
===================================================================
--- general/prog/notify-python.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY notify-python-download-http
-           "http://www.galago-project.org/files/releases/source/notify-python/notify-python-&notify-python-version;.tar.bz2">
-  <!ENTITY notify-python-download-ftp  " ">
-  <!ENTITY notify-python-md5sum        "d247cf79b46cef7495deb0a76334f81d">
-  <!ENTITY notify-python-size          "212 KB">
-  <!ENTITY notify-python-buildsize     "2.3 MB">
-  <!ENTITY notify-python-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Notify Python -->
-  <sect2 id="notify-python" xreflabel="Notify Python-&notify-python-version;">
-
-    <title>Notify Python-&notify-python-version;</title>
-
-    <indexterm zone="notify-python">
-      <primary sortas="a-notify-python">notify-python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Notify Python Module</title>
-
-      <para>
-        Notify Python provides <application>Python 2</application>
-        bindings to the <application>libnotify</application>.
-      </para>
-
-      &lfs74_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&notify-python-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&notify-python-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &notify-python-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &notify-python-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &notify-python-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &notify-python-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/notify-python-&notify-python-version;-libnotify-0.7-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-      <bridgehead renderas="sect4">Notify Python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libnotify"/> and
-        <xref linkend="pygtk"/> (with <xref linkend="gtk2"/> support).
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/notify-python"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Notify Python</title>
-
-      <para>
-        Install <application>Notify Python</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>patch -Np1 -i ../notify-python-&notify-python-version;-libnotify-0.7-1.patch &amp;&amp;
-./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not come with a testsuite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/pynotify
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-  </sect2>
-  <!-- End Notify Python -->
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/prog/perl-modules.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -68,277 +68,4 @@
       </listitem>
     </itemizedlist>
-
-    <!-- Crypt::SSLeay
-    <bridgehead renderas="sect3" id="perl-crypt-ssleay"
-    xreflabel="Crypt::SSLeay-&Crypt-SSLeay-version;">
-    Crypt::SSLeay-&Crypt-SSLeay-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-crypt-ssleay">
-      <primary sortas="a-Crypt-SSLeay">Crypt::SSLeay</primary>
-    </indexterm>
-
-    <para>The Crypt::SSLeay module provides support for the HTTPS protocol under
-    LWP, to allow an LWP::UserAgent object to perform GET, HEAD and POST
-    requests. This module and the dependency modules use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/N/NA/NANIS/Crypt-SSLeay-&Crypt-SSLeay-version;.tar.gz">
-          Crypt::SSLeay-&Crypt-SSLeay-version;</ulink> (MD5 sum: 4812f14d6e8c71714a26c0ad733666dc)
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="openssl"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <ulink url="http://search.cpan.org/~gaas/LWP-Protocol-https/">LWP::Protocol::https</ulink>
-            </para>
-            <itemizedlist>
-              <listitem>
-                <para>
-                  <xref linkend="perl-lwp"/>
-                </para>
-              </listitem>
-              <listitem>
-                <para>
-                  <ulink url="http://search.cpan.org/~behroozi/IO-Socket-SSL/">IO::Socket::SSL</ulink>
-                </para>
-                <itemizedlist>
-                  <listitem>
-                    <para>
-                      <ulink url="http://search.cpan.org/dist/Net-SSLeay/">Net::SSLeay</ulink>
-                    </para>
-                  </listitem>
-                </itemizedlist>
-              </listitem>
-              <listitem>
-                <para>
-                  <ulink url="http://search.cpan.org/~abh/Mozilla-CA/">Mozilla::CA</ulink>
-                </para>
-              </listitem>
-            </itemizedlist>
-          </listitem>
-          <listitem>
-            <para>
-              <ulink url="http://search.cpan.org/~doy/Try-Tiny/">Try::Tiny</ulink>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist> -->
-
-    <!-- Date::Manip
-    <bridgehead renderas="sect3" id="perl-date-manip"
-    xreflabel="Date::Manip-&Date-Manip-version;">
-    Date::Manip-&Date-Manip-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-date-manip">
-      <primary sortas="a-Date-Manip">Date::Manip</primary>
-    </indexterm>
-
-    <para>Date::Manip is a set of routines designed to make any common
-    date/time manipulation easy to do. Operations such as comparing two times,
-    calculating a time a given amount of time from another, or parsing
-    international times are all easily done. From the very beginning, the
-    main focus of Date::Manip has been to be able to do ANY desired date/time
-    operation easily. This module and the dependency module use the standard
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/S/SB/SBECK/Date-Manip-&Date-Manip-version;.tar.gz">
-          Date::Manip-&Date-Manip-version;</ulink> (MD5 sum: 5fd8ba69642db5fc87a99eab6376c0ac)
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <ulink url="http://search.cpan.org/~sbeck/Test-Inter/">Test::Inter</ulink>
-              (optionally used for the tests)
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist> -->
-
-    <!-- ExtUtils::Depends
-    <bridgehead renderas="sect3" id="perl-extutils-depends"
-    xreflabel="ExtUtils::Depends-&ExtUtils-Depends-version;">
-    ExtUtils::Depends-&ExtUtils-Depends-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-extutils-depends">
-      <primary sortas="a-ExtUtils-Depends">ExtUtils::Depends</primary>
-    </indexterm>
-
-    <para>
-      ExtUtils::Depends tries to make it easy to build Perl extensions that use
-      functions and typemaps provided by other perl extensions. This means that
-      a perl extension is treated like a shared library that provides also a C
-      and an XS interface besides the perl one.
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/F/FL/FLORA/ExtUtils-Depends-&ExtUtils-Depends-version;.tar.gz">
-          ExtUtils::Depends-&ExtUtils-Depends-version;</ulink>
-          (uses the standard <xref linkend="perl-standard-install"/>)</para>
-      </listitem>
-    </itemizedlist> -->
-
-    <!-- ExtUtils::PkgConfig
-    <bridgehead renderas="sect3" id="perl-extutils-pkgconfig"
-    xreflabel="ExtUtils::PkgConfig-&ExtUtils-PkgConfig-version;">
-    ExtUtils::PkgConfig-&ExtUtils-PkgConfig-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-extutils-pkgconfig">
-      <primary sortas="a-ExtUtils-PkgConfig">ExtUtils::PkgConfig</primary>
-    </indexterm>
-
-    <para>
-      ExtUtils::PkgConfig is a very simplistic interface to
-      <xref linkend="pkgconfig"/>, intended for use in the Makefile.PL of perl
-      extensions which bind libraries that <application>pkgconfig</application>
-      knows.
-    </para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-&ExtUtils-PkgConfig-version;.tar.gz">
-          ExtUtils::PkgConfig-&ExtUtils-PkgConfig-version;</ulink>
-          (uses the standard <xref linkend="perl-standard-install"/>) Requires:
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-extutils-depends"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist> -->
-
-    <!-- Finance::Quote
-    <bridgehead renderas="sect3" id="perl-finance-quote"
-    xreflabel="Finance::Quote-&Finance-Quote-version;">
-    Finance::Quote-&Finance-Quote-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-finance-quote">
-      <primary sortas="a-Finance-Quote">Finance::Quote</primary>
-    </indexterm>
-
-    <para>Finance::Quote is used to get stock quotes from various Internet
-    sources, including Yahoo! Finance, Fidelity Investments, and the Australian
-    Stock Exchange. There are two methods of using this module &ndash; a
-    functional interface that is deprecated, and an object-orientated method
-    that provides greater flexibility and stability. With the exception of
-    straight currency exchange rates, all information is returned as a
-    two-dimensional hash (or a reference to such a hash, if called in a scalar
-    context).</para>
-
-    <para>After you've installed the package, issue
-    <command>perldoc Finance::Quote</command> for full information.
-    Alternatively, you can issue <command>perldoc lib/Finance/Quote.pm</command>
-    after unpacking the distribution tarball and changing into the top-level
-    directory. This module and the dependency modules are installed using the
-    standard <xref linkend="perl-standard-install"/>.</para>
-
-    <note>
-      <para>To run the regression test suite, you'll need a working Internet
-      connection and then create a symbolic link to the
-      <filename class='directory'>test</filename> directory using the following
-      command after unpacking the tarball and changing into the root directory
-      of the source tree:</para>
-
-<screen><userinput>ln -s test t</userinput></screen>
-
-      <para>Some tests will fail depending on certain conditions. See the
-      <filename>INSTALL</filename> file for full details.</para>
-    </note>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://www.cpan.org/authors/id/E/EC/ECOCODE/Finance-Quote-&Finance-Quote-version;.tar.gz">
-          Finance::Quote-&Finance-Quote-version;</ulink> (MD5 sum: 339e8327a6c18d8194f6c5d1eea3bbde)
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-lwp"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-crypt-ssleay"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-html-tableextract"/>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist> -->
-
-    <!-- Finance::QuoteHist
-    <bridgehead renderas="sect3" id="perl-finance-quotehist"
-    xreflabel="Finance::QuoteHist-&Finance-QuoteHist-version;">
-    Finance::QuoteHist-&Finance-QuoteHist-version;</bridgehead>
-
-    <indexterm zone="perl-modules perl-finance-quotehist">
-      <primary sortas="a-Finance-QuoteHist">Finance::QuoteHist</primary>
-    </indexterm>
-
-    <para>The Finance::QuoteHist bundle is several modules designed to fetch
-    historical stock quotes from the web. The module and dependencies are
-    installed using the standard <application>Perl</application> module
-    <xref linkend="perl-standard-install"/>.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>
-          <ulink url="http://cpan.org/authors/id/M/MS/MSISK/Finance-QuoteHist-&Finance-QuoteHist-version;.tar.gz">
-          Finance-QuoteHist-&Finance-QuoteHist-version;</ulink>
-        </para>
-        <itemizedlist>
-          <listitem>
-            <para>
-              <xref linkend="perl-html-tableextract"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-lwp"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <xref linkend="perl-date-manip"/>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <ulink url="http://cpan.org/authors/id/M/MA/MAKAMAKA/Text-CSV-&Text-CSV-version;.tar.gz">
-              Text-CSV-&Text-CSV-version;</ulink>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              <ulink url="http://cpan.org/authors/id/H/HM/HMBRAND/Text-CSV_XS-&Text-CSV_XS-version;.tgz">
-              Text-CSV_XS-&Text-CSV_XS-version; (optional)</ulink>
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-    -->
 
     <!-- Glib -->
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/prog/php.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -81,6 +81,4 @@
     <xref linkend="aspell"/>,
     <xref linkend="enchant"/>,
-    <xref linkend="pkgconfig"/>,
-    <!-- <xref linkend="recode"/>, -->
     <xref linkend="expat"/> (deprecated alternative to <xref linkend="libxml2"/>),
     <ulink url="http://www.ossp.org/pkg/lib/mm/">OSSP mm</ulink>,
Index: neral/prog/pkgconfig.xml
===================================================================
--- general/prog/pkgconfig.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pkgconfig-download-http "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-  <!ENTITY pkgconfig-download-ftp  "">
-  <!ENTITY pkgconfig-md5sum        "aa3c86e67551adc3ac865160e34a2a0d">
-  <!ENTITY pkgconfig-size          "1.9 MB">
-  <!ENTITY pkgconfig-buildsize     "30 MB">
-  <!ENTITY pkgconfig-time          "0.3 SBU">
-]>
-
-<sect1 id="pkgconfig" xreflabel="pkg-config-&pkgconfig-version;">
-  <?dbhtml filename="pkgconfig.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>pkg-config-&pkgconfig-version;</title>
-
-  <indexterm zone="pkgconfig">
-    <primary sortas="a-pkg-config">pkg-config</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to pkg-config</title>
-
-    <para>
-      The <application>pkg-config</application> package contains a tool for
-      passing the include path and/or library paths to build tools during the
-      <command>configure</command> and <command>make</command> file execution.
-    </para>
-
-    &lfs74_checked;
-
-    <note>
-      <para>
-        Pkg-config is part of LFS, but was omitted from  the 7.0 and 7.1
-        releases. If you are using a system which includes it, there is
-        nothing more to do. If not, you should follow these instructions.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pkgconfig-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pkgconfig-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pkgconfig-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pkgconfig-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pkgconfig-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pkgconfig-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/pkgconfig"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of pkg-config</title>
-
-    <para>
-      Install <application>pkg-config</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --with-internal-glib \
-            --disable-host-tool  \
-            --docdir=/usr/share/doc/pkg-config-&pkgconfig-version; &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>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-internal-glib</option>: This switch causes
-      the package to use the shipped version of GLib2.
-    </para>
-
-    <para>
-      <option>--disable-host-tool</option>: This switch disables
-      creation of the unnecessary symlink.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring pkg-config</title>
-
-    <para>
-      The default setting for <envar>PKG_CONFIG_PATH</envar> is <filename
-      class="directory">/usr/lib/pkgconfig:/usr/share/pkgconfig</filename>
-      because of the prefix used to install
-      <application>pkg-config</application>. You may add to
-      <envar>PKG_CONFIG_PATH</envar> by exporting additional paths on your system
-      where <filename class="extension">.pc</filename> files are installed. Note
-      that <envar>PKG_CONFIG_PATH</envar> is only needed when compiling packages,
-      not during run-time.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pkg-config
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pkg-config">
-        <term><command>pkg-config</command></term>
-        <listitem>
-          <para>
-            returns meta information for the specified library or
-            package.
-          </para>
-          <indexterm zone="pkgconfig pkg-config">
-            <primary sortas="b-pkg-config">pkg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/prog/prog.xml
===================================================================
--- general/prog/prog.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/prog/prog.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -45,5 +45,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl-modules.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="php.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconfig.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="python3.xml"/>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/prog/python-modules.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -35,9 +35,4 @@
         <para>
           <xref linkend="dbus-python"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <xref linkend="notify-python"/>
         </para>
       </listitem>
@@ -89,7 +84,4 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="notify-python.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="py2cairo.xml"/>
 
Index: general/prog/python2.xml
===================================================================
--- general/prog/python2.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/prog/python2.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -105,7 +105,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="expat"/>,
-      <xref linkend="libffi"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="expat"/> and
+      <xref linkend="libffi"/>
     </para>
 
Index: general/prog/python3.xml
===================================================================
--- general/prog/python3.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/prog/python3.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -103,7 +103,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="expat"/>,
-      <xref linkend="libffi"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="expat"/> and
+      <xref linkend="libffi"/>
     </para>
 
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/sysutils/colord.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -88,5 +88,4 @@
     <para role="recommended">
       <xref linkend="libgusb"/>,
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev),
       <xref linkend="polkit"/>,
Index: neral/sysutils/ibus.xml
===================================================================
--- general/sysutils/ibus.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,213 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY ibus-download-http "http://ibus.googlecode.com/files/ibus-&ibus-version;.tar.gz">
-  <!ENTITY ibus-download-ftp  " ">
-  <!ENTITY ibus-md5sum        "6ce27a692d2d4881e9898f3798dcf91c">
-  <!ENTITY ibus-size          "1.9 MB">
-  <!ENTITY ibus-buildsize     "40 MB">
-  <!ENTITY ibus-time          "0.5 SBU">
-]>
-
-<sect1 id="ibus" xreflabel="IBus-&ibus-version;">
-  <?dbhtml filename="ibus.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>IBus-&ibus-version;</title>
-
-  <indexterm zone="ibus">
-    <primary sortas="a-IBus">IBus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to IBus</title>
-
-    <para>
-      <application>IBus</application> is an Intelligent Input Bus. It is a new
-      input framework for Linux OS. It provides full featured and user friendly
-      input method user interface.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&ibus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&ibus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &ibus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &ibus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &ibus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &ibus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">IBus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dconf"/> and
-      <xref linkend="iso-codes"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="gtk2"/>, 
-      <xref linkend="gtk3"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-python"/>,
-      <xref linkend="gtk-doc"/>, and
-      <xref linkend="pyxdg"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/ibus"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IBus</title>
-
-    <para>
-      Install <application>IBus</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr \
-            --sysconfdir=/etc \
-            --libexecdir=/usr/lib/ibus &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Two
-      tests may fail due to problems with the tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--disable-gtk2</option>: This switch disables building
-      of the <application>GTK+ 2</application> immodule. Use it if
-      you have not installed <application>GTK+ 2</application>.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          ibus, ibus-daemon, and ibus-setup
-        </seg>
-        <seg>
-          libibus-1.0.so and im-ibus.so
-          (<application>GTK+ Immodule</application>)
-        </seg>
-        <seg>
-          /etc/dconf/db/ibus.d,
-          /usr/include/ibus-1.0,
-          /usr/lib/ibus,
-          /usr/share/gtk-doc/html/ibus, and
-          /usr/share/ibus
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ibus-daemon">
-        <term><command>ibus-daemon</command></term>
-        <listitem>
-          <para>
-            is the Intelligent Input Bus Daemon.
-          </para>
-          <indexterm zone="ibus ibus-daemon">
-            <primary sortas="b-ibus-daemon">ibus-daemon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ibus-setup">
-        <term><command>ibus-setup</command></term>
-        <listitem>
-          <para>
-            is the <application>GTK+</application> program used to configure
-            the <command>ibus-daemon</command>.
-          </para>
-          <indexterm zone="ibus ibus-setup">
-            <primary sortas="b-ibus-setup">ibus-setup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libibus-1.0">
-        <term><filename class="libraryfile">libibus-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>IBus</application> API functions.
-          </para>
-          <indexterm zone="ibus libibus-1.0">
-            <primary sortas="c-libibus-1.0">libibus-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/strigi.xml
===================================================================
--- general/sysutils/strigi.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/sysutils/strigi.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -72,5 +72,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="gamin"/> (or FAM),
     <xref linkend="ffmpeg"/>,
     <xref linkend="exiv2"/>,
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/sysutils/sysutils.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -31,5 +31,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gpm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hdparm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ibus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="initdtools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lm_sensors.xml"/>
@@ -45,5 +44,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev-extras.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks.xml"/>
Index: neral/sysutils/udev.xml
===================================================================
--- general/sysutils/udev.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!-- <!ENTITY udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2"> -->
-  <!ENTITY udev-download-http "http://www.kernel.org/pub/linux/utils/kernel/hotplug/">
-  <!ENTITY udev-download-ftp  " ">
-  <!-- <!ENTITY udev-md5sum        "aeae0e6273dcbec246c3c1b9868ebed1"> -->
-  <!ENTITY udev-size          "~500 KB">
-  <!ENTITY udev-buildsize     "~10 MB">
-  <!ENTITY udev-time          "~1.8 SBU">
-]>
-
-<sect1 id="udev" xreflabel="udev-&udev-version;">
-  <?dbhtml filename="udev.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="udev">
-    <primary sortas="a-udev">udev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Udev</title>
-
-    <note><para>If you installed LFS from SVN-20120719, LFS-7.2, or later,
-    use <xref linkend='udev-extras'/> instead of this page.</para></note>
-
-    <para><application>Udev</application> was indeed installed in LFS and there
-    is no reason to reinstall it unless you are going to install a package such
-    as <application>UPower</application>. This installation of
-    <application>Udev</application> enables extra features which includes
-    <application>gudev</application>, a requirement for
-    <application>UPower</application> and optionally used by other
-    packages.</para>
-
-    <para>Unlike any other package in the BLFS book, there is no set version
-    of <application>Udev</application> specified to download. Several version
-    updates to LFS and none to BLFS means there are probably many different
-    versions of <application>Udev</application> on the platforms that BLFS is
-    being built upon. Therefore, you should download and use the version of
-    <application>Udev</application> your computer currently uses. The BLFS
-    team has no experience updating (or reverting to an older version) the
-    <application>Udev</application> package <quote>on the fly.</quote> To
-    discover the version of <application>Udev</application> your computer
-    currently uses, issue <command>/sbin/udevadm --version</command>.</para>
-
-    <para>You should look at the LFS instructions for the version you used, to
-    check that you are using the correct testfiles (for some versions, this was a
-    separate tarball, extracted in the udev directory with --strip-components=1)
-    and to compare the configure options you are about to use against those which
-    you used to build the version you are running (sometimes, the options change).
-    </para>
-
-    <para>This package is known to build and work properly using an LFS-7.0
-    platform. (Using Udev-173)</para>
-
-    <para>This package is known to build and work properly using an LFS-7.1
-    platform. (Using Udev-182)</para>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&udev-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&udev-download-ftp;"/></para>
-      </listitem>
-      <!-- <listitem>
-        <para>Download MD5 sum: &udev-md5sum;</para>
-      </listitem> -->
-      <listitem>
-        <para>Download size: &udev-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &udev-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &udev-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Udev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="acl"/>,
-    <xref linkend="glib2"/>,
-    <xref linkend="gperf"/>,
-    <xref linkend="pciutils"/>, and
-    <xref linkend="usbutils"/></para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="gobject-introspection"/></para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udev"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <para>Install <application>Udev</application> by running the following
-    commands:</para>
-
-<screen><userinput>./configure --prefix=/usr                  \
-            --sysconfdir=/etc              \
-            --sbindir=/sbin                \
-            --with-rootlibdir=/lib         \
-            --libexecdir=/lib              \
-            --with-systemdsystemunitdir=no \
-            --disable-introspection        \
-            --docdir=/usr/share/doc/&lt;udev-&udev-version;&gt; &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>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para><option>--disable-introspection</option>: Remove this option if
-    the optional dependency gobject-introspection is installed.</para>
-
-    <para><option>--with-systemdsystemunitdir=no</option>: systemd is not used
-    in (B)LFS.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <para>A list of the installed files, along with their short descriptions
-    can be found at
-    <ulink url="&lfs-root;/chapter06/udev.html#contents-udev"/>.</para>
-
-    <para>The following is some additional content information.</para>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>findkeyboards, firmware, input_id,
-        keyboard-force-release.sh, keymap, modem-modeswitch, pci-db, udev-acl,
-        usb-db, and v4l_id</seg>
-        <seg>libgudev-1.0.so</seg>
-        <seg>/lib/udev/keymaps/force-release,
-        /usr/{include/gudev-1.0/gudev,share/{doc/udev-&udev-version;,
-        gtk-doc/html/gudev}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keymap">
-        <term><command>keymap</command></term>
-        <listitem>
-          <para>configures computer model specific key mappings.</para>
-          <indexterm zone="udev keymap">
-            <primary sortas="b-keymap">keymap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgudev-1.0">
-        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>is a GObject-based wrapper library for libudev.</para>
-          <indexterm zone="udev libgudev-1.0">
-            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/sysutils/udisks.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -82,5 +82,5 @@
       <xref linkend="polkit"/>,
       <xref linkend="sg3_utils"/>, and
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev)
+      <xref linkend="udev-extras"/> (for gudev)
     </para>
 
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/sysutils/udisks2.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -80,5 +80,5 @@
       <xref linkend="libxslt"/>,
       <xref linkend="polkit"/>,  and
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="udev-extras"/> (for GUdev)
     </para>
 
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/sysutils/upower.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -81,5 +81,4 @@
       <xref linkend="libusb"/>,
       <xref linkend="polkit"/>, and
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev)
     </para>
Index: general/sysutils/usbutils.xml
===================================================================
--- general/sysutils/usbutils.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ general/sysutils/usbutils.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -76,6 +76,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libusb"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="libusb"/>
     </para>
 
Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ gnome/applications/cheese.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -83,5 +83,4 @@
       <xref linkend="libcanberra"/>,
       <xref linkend="librsvg"/>,
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev), and
       <xref linkend="yelp-xsl"/>
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ gnome/platform/gvfs.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -86,5 +86,4 @@
       <xref linkend="libsecret"/>,
       <xref linkend="libsoup"/>,
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev), and
       <xref linkend="udisks2"/>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ introduction/welcome/changelog.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -48,4 +48,8 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Archive unneeded packages: pkgconfig,
+          bc, ibus, udev, slib, gamin, and notify-python.</para>
+        </listitem>
+        <listitem>
           <para>[fernando] - Update to glib-networking-2.38.1. Fixes
             <ulink url="&blfs-ticket-root;4186">#4186</ulink>.</para>
Index: kde/add/kdeplasma-addons.xml
===================================================================
--- kde/add/kdeplasma-addons.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ kde/add/kdeplasma-addons.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -77,5 +77,5 @@
     <para role="optional">
     <xref linkend="libkexiv2"/>,
-    <xref linkend="ibus"/>,
+    <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
     <xref linkend="qjson"/>,
     <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper),
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -96,5 +96,5 @@
       <xref linkend="libtheora"/>,
       <xref linkend="libvorbis"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for gudev), and
+      <xref linkend="udev-extras"/> (for gudev), and
       <xref linkend="xorg7-lib"/>
     </para>
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -111,5 +111,5 @@
       <xref linkend="speex"/>,
       <xref linkend="taglib"/>,
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev),
+      <xref linkend="udev-extras"/> (for GUdev),
       <ulink url="http://jackaudio.org/">JACK</ulink>,
       <ulink url="http://caca.zoy.org/wiki/libcaca">libcaca</ulink>,
Index: multimedia/libdriv/libdv.xml
===================================================================
--- multimedia/libdriv/libdv.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ multimedia/libdriv/libdv.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -63,7 +63,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional"><xref linkend="popt"/>,
-    <xref linkend="pkgconfig"/>,
-    <xref linkend="sdl"/>,
-    <!-- <xref linkend="GTK"/>, -->and
+    <xref linkend="sdl"/>, and
     <xref linkend="x-window-system"/></para>
 
Index: multimedia/libdriv/pulseaudio.xml
===================================================================
--- multimedia/libdriv/pulseaudio.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ multimedia/libdriv/pulseaudio.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -81,7 +81,6 @@
     <para role="required">
       <xref linkend="intltool"/>,
-      <xref linkend="json-c"/>,
-      <xref linkend="libsndfile"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="json-c"/>, and
+      <xref linkend="libsndfile"/>
     </para>
 
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ multimedia/videoutils/xine-ui.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -96,5 +96,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="pkgconfig"/>,
       <xref linkend="curl"/>,
       <xref linkend="aalib"/>,
Index: networking/netlibs/libtirpc.xml
===================================================================
--- networking/netlibs/libtirpc.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ networking/netlibs/libtirpc.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -90,9 +90,4 @@
 
     <bridgehead renderas="sect3">libtirpc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pkgconfig"/>
-    </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
Index: networking/netprogs/nfs-utils.xml
===================================================================
--- networking/netprogs/nfs-utils.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ networking/netprogs/nfs-utils.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -63,6 +63,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-       <xref linkend="libtirpc"/> and
-       <xref linkend="pkgconfig"/>
+       <xref linkend="libtirpc"/>
     </para>
 
Index: networking/netprogs/samba.xml
===================================================================
--- networking/netprogs/samba.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ networking/netprogs/samba.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -74,5 +74,5 @@
       <xref linkend="cups"/>,
       <xref linkend="openldap"/>,
-      <xref linkend="gamin"/>,
+      <ulink url="https://people.gnome.org/~veillard/gamin/">Gamin</ulink>,
       <xref linkend="acl"/>,
       <xref linkend="xfsprogs"/>,
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ networking/netutils/networkmanager.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -84,5 +84,4 @@
       <xref linkend="libnl"/>,
       <xref linkend="nss"/>, and
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev)
     </para>
Index: networking/netutils/wireshark.xml
===================================================================
--- networking/netutils/wireshark.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ networking/netutils/wireshark.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -99,5 +99,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="pkgconfig"/>,
       <xref linkend="gtk2"/> or <xref linkend="gtk3"/> (to build the GUI front-end),
       <xref linkend="openssl"/>,
Index: postlfs/security/openssl.xml
===================================================================
--- postlfs/security/openssl.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ postlfs/security/openssl.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -96,6 +96,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="bc"/> (required for full coverage by the test suite during
-      the build) and
       <xref linkend="mitkrb"/>
     </para>
Index: x/installing/makedepend.xml
===================================================================
--- x/installing/makedepend.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ x/installing/makedepend.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -61,6 +61,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="xorg7-proto"/> and
-      <xref linkend="pkgconfig"/>
+      <xref linkend="xorg7-proto"/>
     </para>
 
Index: x/lib/agg.xml
===================================================================
--- x/lib/agg.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ x/lib/agg.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -77,6 +77,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="pkgconfig"/>,
-      <xref linkend="sdl"/>, and
+      <xref linkend="sdl"/> and
       <xref linkend="xorg7-lib"/>
     </para>
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ x/lib/clutter.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -102,5 +102,4 @@
       <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
       <ulink url="http://tslib.berlios.de/">Tslib</ulink>,
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev), and
       <ulink url="http://wayland.freedesktop.org/">Wayland</ulink>
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ x/lib/webkitgtk2.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -86,5 +86,4 @@
       <xref linkend="ruby"/>,
       <xref linkend="sqlite"/>,
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev), and
       <xref linkend="which"/>
Index: xfce/core/thunar-volman.xml
===================================================================
--- xfce/core/thunar-volman.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ xfce/core/thunar-volman.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -79,5 +79,4 @@
       <xref linkend="exo"/>,
       <xref linkend="libxfce4ui"/> and
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev)
     </para>
Index: xfce/core/thunar.xml
===================================================================
--- xfce/core/thunar.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ xfce/core/thunar.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -85,5 +85,4 @@
       <xref linkend="libnotify"/>,
       <xref linkend="startup-notification"/>,
-      <xref linkend="udev"/> or
       <xref linkend="udev-extras"/> (for GUdev) and
       <xref linkend="xfce4-panel"/>
Index: xsoft/other/blueman.xml
===================================================================
--- xsoft/other/blueman.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ xsoft/other/blueman.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -78,5 +78,5 @@
       <xref linkend="dbus-python"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="notify-python"/>,
+      <!-- <xref linkend="notify-python"/>, -->
       <xref linkend="pygtk"/> (with <xref linkend="gtk2"/> support),
       <xref linkend="pyrex"/>, and
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 598d4ef37980bc7583d99e3a9babfb5e96a84e79)
+++ xsoft/other/gimp.xml	(revision adf6dd9a5524c7dfa135ca073622f5aa4add7feb)
@@ -145,5 +145,5 @@
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
-      <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev),
+      <xref linkend="udev-extras"/> (for GUdev),
       <xref linkend="webkitgtk"/> and
       <xref linkend="gtk-doc"/>
