Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ general/genlib/genlib.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -57,7 +57,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gobject-introspection.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gsl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="js.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
@@ -102,5 +102,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca.xml"/>
   <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="talloc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
Index: general/genlib/grantlee.xml
===================================================================
--- general/genlib/grantlee.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
+++ general/genlib/grantlee.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -0,0 +1,122 @@
+<?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 grantlee-download-http
+           "http://downloads.grantlee.org/grantlee-&grantlee-version;.tar.gz">
+  <!ENTITY grantlee-download-ftp  " ">
+  <!ENTITY grantlee-md5sum        "fa8a2e9be7be7e3a89e700679e6f3014">
+  <!ENTITY grantlee-size          "1.1 MB">
+  <!ENTITY grantlee-buildsize     "31 MB">
+  <!ENTITY grantlee-time          "0.8 SBU">
+]>
+
+<sect1 id="grantlee" xreflabel="grantlee-&grantlee-version;">
+  <?dbhtml filename="grantlee.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: krejzi $</othername>
+    <date>$Date: 2013-08-04 11:28:54 -0500 (Sun, 04 Aug 2013) $</date>
+  </sect1info>
+
+  <title>Grantlee-&grantlee-version;</title>
+
+  <indexterm zone="grantlee">
+    <primary sortas="a-grantlee">grantlee</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to grantlee</title>
+
+    <para>
+       Grantlee is a set of free software libraries written using the Qt
+       framework. Currently two libraries are shipped with Grantlee: Grantlee
+       Templates and Grantlee TextDocument. The goal of Grantlee Templates is
+       to make it easier for application developers to separate the structure
+       of documents from the data they contain, opening the door for theming.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&grantlee-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&grantlee-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &grantlee-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &grantlee-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &grantlee-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &grantlee-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Grantlee Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/> and <xref linkend="qt4"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/grantlee"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Grantlee</title>
+
+    <para>Install <application>Grantlee</application> by
+    running the following commands:</para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd build &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release \
+      .. &amp;&amp;
+make</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</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>none</seg>
+        <seg>
+           libgrantlee_core.so and 
+           libgrantlee_gui.so
+        </seg>
+        <seg>
+           &kde-dir;/lib/cmake/grantlee, 
+           &kde-dir;/lib/grantlee/0.4, and
+           &kde-dir;/include/grantlee</seg>
+      </seglistitem>
+    </segmentedlist>
+  </sect2>
+
+</sect1>
Index: neral/genlib/iso-codes.xml
===================================================================
--- general/genlib/iso-codes.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ 	(revision )
@@ -1,128 +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 iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
--->
-  <!ENTITY iso-codes-download-http "http://anduin.&lfs-domainname;/sources/BLFS/svn/i/iso-codes-&iso-codes-version;.tar.xz">
-  <!ENTITY iso-codes-download-ftp  " ">
-  <!ENTITY iso-codes-md5sum        "6488463aae295c5461f9483fe301c18f">
-  <!ENTITY iso-codes-size          "3.5 MB">
-  <!ENTITY iso-codes-buildsize     "106 MB">
-  <!ENTITY iso-codes-time          "0.3 SBU">
-]>
-
-<sect1 id="iso-codes" xreflabel="ISO Codes-&iso-codes-version;">
-  <?dbhtml filename="iso-codes.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>ISO Codes-&iso-codes-version;</title>
-
-  <indexterm zone="iso-codes">
-    <primary sortas="a-ISO-Codes">ISO Codes</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ISO Codes</title>
-
-    <para>
-      The <application>ISO Codes</application> package contains a list of
-      country, language and currency names and it is used as a central
-      database for accessing this data.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&iso-codes-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&iso-codes-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &iso-codes-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &iso-codes-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &iso-codes-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &iso-codes-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/iso-codes"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ISO Codes</title>
-
-    <para>
-      Install <application>ISO Codes</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</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</userinput></screen>
-
-  </sect2>
-
-  <sect2 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/share/xml/iso-codes
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: neral/genlib/sbc.xml
===================================================================
--- general/genlib/sbc.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ 	(revision )
@@ -1,157 +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 sbc-download-http "http://www.kernel.org/pub/linux/bluetooth/sbc-&sbc-version;.tar.xz">
-  <!ENTITY sbc-download-ftp  "ftp://www.kernel.org/pub/linux/bluetooth/sbc-&sbc-version;.tar.xz">
-  <!ENTITY sbc-md5sum        "ecadadbfd4b1dfe7b98f446c69126b23">
-  <!ENTITY sbc-size          "240 KB">
-  <!ENTITY sbc-buildsize     "3.0 MB">
-  <!ENTITY sbc-time          "0.1 SBU">
-]>
-
-<sect1 id="sbc" xreflabel="SBC-&sbc-version;">
-  <?dbhtml filename="sbc.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>SBC-&sbc-version;</title>
-
-  <indexterm zone="sbc">
-    <primary sortas="a-SBC">SBC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SBC</title>
-
-    <para>
-      The <application>SBC</application> is a digital audio encoder and decoder used to
-      transfer data to Bluetooth audio output devices like headphones or loudspeakers.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&sbc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&sbc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &sbc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &sbc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &sbc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &sbc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SBC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libsndfile"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/sbc"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SBC</title>
-
-    <para>
-      Install <application>SBC</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</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</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          sbcdec, sbcenc, and sbcinfo
-        </seg>
-        <seg>
-          libsbc.so
-        </seg>
-        <seg>
-          /usr/include/sbc
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsbc">
-        <term><filename class="libraryfile">libsbc.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>SBC</application> API functions.
-          </para>
-          <indexterm zone="sbc libsbc">
-            <primary sortas="c-libsbc">libsbc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genutils/genutils.xml
===================================================================
--- general/genutils/genutils.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ general/genutils/genutils.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -27,7 +27,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-doc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hd2u.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hicolor-icon-theme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="icon-naming-utils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imagemagick.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iso-codes.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pinentry.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtchooser.xml"/>
Index: general/genutils/hicolor-icon-theme.xml
===================================================================
--- general/genutils/hicolor-icon-theme.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
+++ general/genutils/hicolor-icon-theme.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -0,0 +1,113 @@
+<?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 hicolor-icon-theme-download-http "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
+  <!ENTITY hicolor-icon-theme-download-ftp  "&gentoo-ftp-repo;/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
+  <!ENTITY hicolor-icon-theme-md5sum        "55cafbcef8bcf7107f6d502149eb4d87">
+  <!ENTITY hicolor-icon-theme-size          "38 KB">
+  <!ENTITY hicolor-icon-theme-buildsize     "2 MB">
+  <!ENTITY hicolor-icon-theme-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="hicolor-icon-theme"
+xreflabel="hicolor-icon-theme-&hicolor-icon-theme-version;">
+  <?dbhtml filename="hicolor-icon-theme.html" ?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>hicolor-icon-theme-&hicolor-icon-theme-version;</title>
+
+  <indexterm zone="hicolor-icon-theme">
+    <primary sortas="a-Hicolor-icon-theme">Hicolor-icon-theme</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to hicolor-icon-theme</title>
+
+    <para>The <application>hicolor-icon-theme</application> package
+    contains a default fallback theme for implementations of the icon
+    theme specification.</para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&hicolor-icon-theme-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&hicolor-icon-theme-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &hicolor-icon-theme-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &hicolor-icon-theme-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &hicolor-icon-theme-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &hicolor-icon-theme-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/hicolor-icon-theme"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of hicolor-icon-theme</title>
+
+    <para>Install <application>hicolor-icon-theme</application> by running
+    the following commands:</para>
+
+<screen><userinput>./configure --prefix=/usr</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</userinput></screen>
+
+  </sect2>
+
+  <sect2 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/share/icons/hicolor</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="hicolor-icon-themes">
+        <term>/usr/share/icons/hicolor/*</term>
+        <listitem>
+          <para>contains icon definitions used as defaults.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genutils/iso-codes.xml
===================================================================
--- general/genutils/iso-codes.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
+++ general/genutils/iso-codes.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -0,0 +1,128 @@
+<?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 iso-codes-download-http "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-&iso-codes-version;.tar.xz">
+-->
+  <!ENTITY iso-codes-download-http "http://anduin.&lfs-domainname;/sources/BLFS/svn/i/iso-codes-&iso-codes-version;.tar.xz">
+  <!ENTITY iso-codes-download-ftp  " ">
+  <!ENTITY iso-codes-md5sum        "6488463aae295c5461f9483fe301c18f">
+  <!ENTITY iso-codes-size          "3.5 MB">
+  <!ENTITY iso-codes-buildsize     "106 MB">
+  <!ENTITY iso-codes-time          "0.3 SBU">
+]>
+
+<sect1 id="iso-codes" xreflabel="ISO Codes-&iso-codes-version;">
+  <?dbhtml filename="iso-codes.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>ISO Codes-&iso-codes-version;</title>
+
+  <indexterm zone="iso-codes">
+    <primary sortas="a-ISO-Codes">ISO Codes</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to ISO Codes</title>
+
+    <para>
+      The <application>ISO Codes</application> package contains a list of
+      country, language and currency names and it is used as a central
+      database for accessing this data.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&iso-codes-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&iso-codes-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &iso-codes-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &iso-codes-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &iso-codes-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &iso-codes-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/iso-codes"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of ISO Codes</title>
+
+    <para>
+      Install <application>ISO Codes</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</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</userinput></screen>
+
+  </sect2>
+
+  <sect2 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/share/xml/iso-codes
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ kde/add/add.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -21,5 +21,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkcddb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim-runtime.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grantlee.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdepim.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkexiv2.xml"/>
Index: e/add/grantlee.xml
===================================================================
--- kde/add/grantlee.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ 	(revision )
@@ -1,122 +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 grantlee-download-http
-           "http://downloads.grantlee.org/grantlee-&grantlee-version;.tar.gz">
-  <!ENTITY grantlee-download-ftp  " ">
-  <!ENTITY grantlee-md5sum        "fa8a2e9be7be7e3a89e700679e6f3014">
-  <!ENTITY grantlee-size          "1.1 MB">
-  <!ENTITY grantlee-buildsize     "31 MB">
-  <!ENTITY grantlee-time          "0.8 SBU">
-]>
-
-<sect1 id="grantlee" xreflabel="grantlee-&grantlee-version;">
-  <?dbhtml filename="grantlee.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: krejzi $</othername>
-    <date>$Date: 2013-08-04 11:28:54 -0500 (Sun, 04 Aug 2013) $</date>
-  </sect1info>
-
-  <title>Grantlee-&grantlee-version;</title>
-
-  <indexterm zone="grantlee">
-    <primary sortas="a-grantlee">grantlee</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to grantlee</title>
-
-    <para>
-       Grantlee is a set of free software libraries written using the Qt
-       framework. Currently two libraries are shipped with Grantlee: Grantlee
-       Templates and Grantlee TextDocument. The goal of Grantlee Templates is
-       to make it easier for application developers to separate the structure
-       of documents from the data they contain, opening the door for theming.
-    </para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&grantlee-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&grantlee-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &grantlee-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &grantlee-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &grantlee-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &grantlee-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grantlee Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and <xref linkend="qt4"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/grantlee"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grantlee</title>
-
-    <para>Install <application>Grantlee</application> by
-    running the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release \
-      .. &amp;&amp;
-make</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</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>
-           libgrantlee_core.so and 
-           libgrantlee_gui.so
-        </seg>
-        <seg>
-           &kde-dir;/lib/cmake/grantlee, 
-           &kde-dir;/lib/grantlee/0.4, and
-           &kde-dir;/include/grantlee</seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: multimedia/libdriv/libdriv.xml
===================================================================
--- multimedia/libdriv/libdriv.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ multimedia/libdriv/libdriv.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -72,4 +72,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opus.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pulseaudio.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="sdl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soundtouch.xml"/>
Index: multimedia/libdriv/sbc.xml
===================================================================
--- multimedia/libdriv/sbc.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
+++ multimedia/libdriv/sbc.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -0,0 +1,157 @@
+<?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 sbc-download-http "http://www.kernel.org/pub/linux/bluetooth/sbc-&sbc-version;.tar.xz">
+  <!ENTITY sbc-download-ftp  "ftp://www.kernel.org/pub/linux/bluetooth/sbc-&sbc-version;.tar.xz">
+  <!ENTITY sbc-md5sum        "ecadadbfd4b1dfe7b98f446c69126b23">
+  <!ENTITY sbc-size          "240 KB">
+  <!ENTITY sbc-buildsize     "3.0 MB">
+  <!ENTITY sbc-time          "0.1 SBU">
+]>
+
+<sect1 id="sbc" xreflabel="SBC-&sbc-version;">
+  <?dbhtml filename="sbc.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>SBC-&sbc-version;</title>
+
+  <indexterm zone="sbc">
+    <primary sortas="a-SBC">SBC</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to SBC</title>
+
+    <para>
+      The <application>SBC</application> is a digital audio encoder and decoder used to
+      transfer data to Bluetooth audio output devices like headphones or loudspeakers.
+    </para>
+
+    &lfs74_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&sbc-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&sbc-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &sbc-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &sbc-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &sbc-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &sbc-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">SBC Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libsndfile"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/sbc"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of SBC</title>
+
+    <para>
+      Install <application>SBC</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</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</userinput></screen>
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          sbcdec, sbcenc, and sbcinfo
+        </seg>
+        <seg>
+          libsbc.so
+        </seg>
+        <seg>
+          /usr/include/sbc
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libsbc">
+        <term><filename class="libraryfile">libsbc.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>SBC</application> API functions.
+          </para>
+          <indexterm zone="sbc libsbc">
+            <primary sortas="c-libsbc">libsbc.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: lib/hicolor-icon-theme.xml
===================================================================
--- x/lib/hicolor-icon-theme.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ 	(revision )
@@ -1,113 +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 hicolor-icon-theme-download-http "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
-  <!ENTITY hicolor-icon-theme-download-ftp  "&gentoo-ftp-repo;/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
-  <!ENTITY hicolor-icon-theme-md5sum        "55cafbcef8bcf7107f6d502149eb4d87">
-  <!ENTITY hicolor-icon-theme-size          "38 KB">
-  <!ENTITY hicolor-icon-theme-buildsize     "2 MB">
-  <!ENTITY hicolor-icon-theme-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="hicolor-icon-theme"
-xreflabel="hicolor-icon-theme-&hicolor-icon-theme-version;">
-  <?dbhtml filename="hicolor-icon-theme.html" ?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>hicolor-icon-theme-&hicolor-icon-theme-version;</title>
-
-  <indexterm zone="hicolor-icon-theme">
-    <primary sortas="a-Hicolor-icon-theme">Hicolor-icon-theme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to hicolor-icon-theme</title>
-
-    <para>The <application>hicolor-icon-theme</application> package
-    contains a default fallback theme for implementations of the icon
-    theme specification.</para>
-
-    &lfs74_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&hicolor-icon-theme-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&hicolor-icon-theme-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &hicolor-icon-theme-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &hicolor-icon-theme-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &hicolor-icon-theme-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &hicolor-icon-theme-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/hicolor-icon-theme"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of hicolor-icon-theme</title>
-
-    <para>Install <application>hicolor-icon-theme</application> by running
-    the following commands:</para>
-
-<screen><userinput>./configure --prefix=/usr</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</userinput></screen>
-
-  </sect2>
-
-  <sect2 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/share/icons/hicolor</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hicolor-icon-themes">
-        <term>/usr/share/icons/hicolor/*</term>
-        <listitem>
-          <para>contains icon definitions used as defaults.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision 68bd004fe9367cd554be2fe37324914ae91b5850)
+++ x/lib/lib.xml	(revision d17ab8f7e3bb37750f5f5a3d5fdd807b43f0caaf)
@@ -44,5 +44,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hicolor-icon-theme.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
