Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 83f6c770f5d0b55096b417f4fc5fb23412c1cc51)
+++ general/genlib/genlib.xml	(revision c4dd285f32e3683ee41ba701fd75e0cb937acc1e)
@@ -73,5 +73,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm-systemd.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="libesmtp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libevdev-systemd.xml"/>
@@ -81,5 +81,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgudev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb-systemd.xml"/>
+  <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="libidn.xml"/>
@@ -114,5 +114,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pth.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ptlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qca-systemd.xml"/>
+  <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="talloc.xml"/>
Index: general/genlib/libdrm-systemd.xml
===================================================================
--- general/genlib/libdrm-systemd.xml	(revision 83f6c770f5d0b55096b417f4fc5fb23412c1cc51)
+++ general/genlib/libdrm-systemd.xml	(revision c4dd285f32e3683ee41ba701fd75e0cb937acc1e)
@@ -7,8 +7,8 @@
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "de49916e5f8aef4eba55223c79709b05">
-  <!ENTITY libdrm-size          "632 KB">
-  <!ENTITY libdrm-buildsize     "15 MB (with tests)">
-  <!ENTITY libdrm-time          "0.2 SBU (additional 0.8 SBU for tests)">
+  <!ENTITY libdrm-md5sum        "c6809c48538d6e5999588832045ff014">
+  <!ENTITY libdrm-size          "680 KB">
+  <!ENTITY libdrm-buildsize     "17 MB (with tests)">
+  <!ENTITY libdrm-time          "0.8 SBU (with tests)">
 ]>
 
@@ -17,6 +17,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy: krejzi $</othername>
-    <date>$Date: 2014-10-27 19:51:53 +0100 (Mon, 27 Oct 2014) $</date>
+    <othername>$LastChangedBy: fernando $</othername>
+    <date>$Date: 2015-12-28 12:21:27 -0600 (Mon, 28 Dec 2015) $</date>
   </sect1info>
 
@@ -38,5 +38,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -78,10 +78,9 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libpciaccess"/> (for Intel KMS API support required by Mesa)
+      <xref linkend="xorg7-lib"/> (for Intel KMS API support required by Mesa) <!-- libpciaccess -->
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="cairo"/> (for the testsuite),
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/> and
@@ -103,11 +102,17 @@
     </para>
 
-<screen><userinput>sed -e "/pthread-stubs/d" -i configure.ac &amp;&amp;
-autoreconf -fi &amp;&amp;
-./configure --prefix=/usr --enable-udev --disable-valgrind &amp;&amp;
+<screen><userinput>sed -e "/pthread-stubs/d" \
+    -i configure.ac &amp;&amp;
+autoreconf -fiv     &amp;&amp;
+
+./configure --prefix=/usr --enable-udev &amp;&amp;
+
 make</userinput></screen>
 
     <para>
-      To check the results, issue <command>make check</command>.
+      To check the results, issue <command>make check</command>. Tests may hang
+      for unknown reasons. If nouveau threaded test hangs, you can disable it
+      with
+      <command>sed -i 's/^TESTS/#&amp;/' tests/nouveau/Makefile.in</command>.
     </para>
 
@@ -130,12 +135,12 @@
 
     <para>
-      <parameter>--disable-valgrind</parameter>: This parameter remvoes a hard 
-      dependency on Valgrind.
-    </para>
-
-    <para>
       <parameter>--enable-udev</parameter>: This parameter enables support for using
       <application>Udev</application> instead of <command>mknod</command>.
     </para>
+<!--
+    <para>
+      <parameter>-\-disable-valgrind</parameter>: This parameter fixes a hard dependency on
+      <application>Valgrind</application>.
+    </para> -->
 
   </sect2>
@@ -154,10 +159,9 @@
         </seg>
         <seg>
-          libdrm.so, libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
-          libdrm_radeon.so and libkms.so
+          libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
+          libdrm_radeon.so, libdrm.so, and libkms.so
         </seg>
         <seg>
-          /usr/include/libdrm and
-          /usr/include/libkms
+          /usr/include/lib{drm,kms}
         </seg>
       </seglistitem>
@@ -169,4 +173,42 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="libdrm_amdgpu">
+        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
+        <listitem>
+          <para>
+            contains the AMDGPU specific Direct Rendering Manager functions.
+          </para>
+          <indexterm zone="libdrm libdrm_amdgpu">
+            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm_intel">
+        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
+        <listitem>
+          <para>
+            contains the Intel specific Direct Rendering Manager
+            functions.
+          </para>
+          <indexterm zone="libdrm libdrm_intel">
+            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm_nouveau">
+        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
+        <listitem>
+          <para>
+            contains the open source nVidia (Nouveau) specific Direct
+            Rendering Manager functions.
+          </para>
+          <indexterm zone="libdrm libdrm_nouveau">
+            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libdrm-lib">
         <term><filename class="libraryfile">libdrm.so</filename></term>
@@ -180,42 +222,4 @@
         </listitem>
       </varlistentry>
-      
-      <varlistentry id="libdrm_amdgpu">
-        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
-        <listitem>
-          <para>
-            contains the AMDGPU specific DRM functions.
-          </para>
-          <indexterm zone="libdrm libdrm_amdgpu">
-            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_intel">
-        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
-        <listitem>
-          <para>
-            contains the Intel specific Direct Rendering Manager
-            functions.
-          </para>
-          <indexterm zone="libdrm libdrm_intel">
-            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_nouveau">
-        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
-        <listitem>
-          <para>
-            contains the open source nVidia (Nouveau) specific Direct
-            Rendering Manager functions.
-          </para>
-          <indexterm zone="libdrm libdrm_nouveau">
-            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
       <varlistentry id="libdrm_radeon">
Index: general/genlib/libdrm.xml
===================================================================
--- general/genlib/libdrm.xml	(revision 83f6c770f5d0b55096b417f4fc5fb23412c1cc51)
+++ general/genlib/libdrm.xml	(revision c4dd285f32e3683ee41ba701fd75e0cb937acc1e)
@@ -7,8 +7,8 @@
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.bz2">
   <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "543b2d28359ef33974fa0e772dd61732">
-  <!ENTITY libdrm-size          "628 KB">
-  <!ENTITY libdrm-buildsize     "15 MB (with the test suite)">
-  <!ENTITY libdrm-time          "0.4 SBU (up to an additional 2.0 SBU for the test suite)">
+  <!ENTITY libdrm-md5sum        "c6809c48538d6e5999588832045ff014">
+  <!ENTITY libdrm-size          "680 KB">
+  <!ENTITY libdrm-buildsize     "17 MB (with tests)">
+  <!ENTITY libdrm-time          "0.8 SBU (with tests)">
 ]>
 
@@ -83,5 +83,4 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="cairo"/> (for the testsuite),
       <xref linkend="DocBook"/>,
       <xref linkend="docbook-xsl"/> and
@@ -103,11 +102,17 @@
     </para>
 
-<screen><userinput>sed -e "/pthread-stubs/d" -i configure.ac &amp;&amp;
-autoreconf -fiv &amp;&amp;
+<screen><userinput>sed -e "/pthread-stubs/d" \
+    -i configure.ac &amp;&amp;
+autoreconf -fiv     &amp;&amp;
+
 ./configure --prefix=/usr --enable-udev &amp;&amp;
+
 make</userinput></screen>
 
     <para>
-      To check the results, issue <command>make check</command>.
+      To check the results, issue <command>make check</command>. Tests may hang
+      for unknown reasons. If nouveau threaded test hangs, you can disable it
+      with
+      <command>sed -i 's/^TESTS/#&amp;/' tests/nouveau/Makefile.in</command>.
     </para>
 
@@ -133,4 +138,9 @@
       <application>Udev</application> instead of <command>mknod</command>.
     </para>
+<!--
+    <para>
+      <parameter>-\-disable-valgrind</parameter>: This parameter fixes a hard dependency on
+      <application>Valgrind</application>.
+    </para> -->
 
   </sect2>
@@ -149,10 +159,9 @@
         </seg>
         <seg>
-          libdrm.so, libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
-          libdrm_radeon.so and libkms.so
+          libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
+          libdrm_radeon.so, libdrm.so, and libkms.so
         </seg>
         <seg>
-          /usr/include/libdrm and
-          /usr/include/libkms
+          /usr/include/lib{drm,kms}
         </seg>
       </seglistitem>
@@ -164,4 +173,42 @@
       <?dbhtml list-presentation="table"?>
 
+      <varlistentry id="libdrm_amdgpu">
+        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
+        <listitem>
+          <para>
+            contains the AMDGPU specific Direct Rendering Manager functions.
+          </para>
+          <indexterm zone="libdrm libdrm_amdgpu">
+            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm_intel">
+        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
+        <listitem>
+          <para>
+            contains the Intel specific Direct Rendering Manager
+            functions.
+          </para>
+          <indexterm zone="libdrm libdrm_intel">
+            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdrm_nouveau">
+        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
+        <listitem>
+          <para>
+            contains the open source nVidia (Nouveau) specific Direct
+            Rendering Manager functions.
+          </para>
+          <indexterm zone="libdrm libdrm_nouveau">
+            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libdrm-lib">
         <term><filename class="libraryfile">libdrm.so</filename></term>
@@ -176,42 +223,4 @@
       </varlistentry>
 
-      <varlistentry id="libdrm_amdgpu">
-        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
-        <listitem>
-          <para>
-            contains the AMD specific DRM functions.
-          </para>
-          <indexterm zone="libdrm libdrm_amdgpu">
-            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_intel">
-        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
-        <listitem>
-          <para>
-            contains the Intel specific Direct Rendering Manager
-            functions.
-          </para>
-          <indexterm zone="libdrm libdrm_intel">
-            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_nouveau">
-        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
-        <listitem>
-          <para>
-            contains the open source nVidia (Nouveau) specific Direct
-            Rendering Manager functions.
-          </para>
-          <indexterm zone="libdrm libdrm_nouveau">
-            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="libdrm_radeon">
         <term><filename class="libraryfile">libdrm_radeon.so</filename></term>
Index: general/genlib/libgusb-systemd.xml
===================================================================
--- general/genlib/libgusb-systemd.xml	(revision 83f6c770f5d0b55096b417f4fc5fb23412c1cc51)
+++ 	(revision )
@@ -1,176 +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 libgusb-download-http "http://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz">
-  <!ENTITY libgusb-download-ftp  " ">
-  <!ENTITY libgusb-md5sum        "d0e4c970e2386900c99cab41d9b17e23">
-  <!ENTITY libgusb-size          "284 KB">
-  <!ENTITY libgusb-buildsize     "5.4 MB (with tests))">
-  <!ENTITY libgusb-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libgusb" xreflabel="libgusb-&libgusb-version;">
-  <?dbhtml filename="libgusb.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libgusb-&libgusb-version;</title>
-
-  <indexterm zone="libgusb">
-    <primary sortas="a-libgusb">libgusb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgusb</title>
-
-    <para>
-      The <application>libgusb</application> package contains the GObject
-      wrappers for <application>libusb-1.0</application> that makes it
-      easy to do asynchronous control, bulk and interrupt transfers with
-      proper cancellation and integration into a mainloop.
-    </para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgusb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgusb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgusb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgusb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgusb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgusb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgusb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gobject-introspection"/>,
-      <xref linkend="usbutils"/> (for <filename>usb.ids</filename> data file,
-      which is also required for the tests), and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-    <para condition="html" role="usernotes">
-      User Notes: <ulink url="&blfs-wiki;/libgusb"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgusb</title>
-
-    <para>
-      Install <application>libgusb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &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/static-libraries.xml"/>
-
-    <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>
-          None
-        </seg>
-        <seg>
-          libgusb.so
-        </seg>
-        <seg>
-          /usr/include/gusb-1 and
-          /usr/share/gtk-doc/html/gusb
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgusb-lib">
-        <term><filename class="libraryfile">libgusb.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgusb</application> API functions.
-          </para>
-          <indexterm zone="libgusb libgusb-lib">
-            <primary sortas="c-libgusb">libgusb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgusb.xml
===================================================================
--- general/genlib/libgusb.xml	(revision 83f6c770f5d0b55096b417f4fc5fb23412c1cc51)
+++ general/genlib/libgusb.xml	(revision c4dd285f32e3683ee41ba701fd75e0cb937acc1e)
@@ -7,8 +7,8 @@
   <!ENTITY libgusb-download-http "http://people.freedesktop.org/~hughsient/releases/libgusb-&libgusb-version;.tar.xz">
   <!ENTITY libgusb-download-ftp  " ">
-  <!ENTITY libgusb-md5sum        "eae30027dfad4dd30f77d8ed8d85b40e">
-  <!ENTITY libgusb-size          "272 KB">
-  <!ENTITY libgusb-buildsize     "4.2 MB">
-  <!ENTITY libgusb-time          "less than 0.1 SBU">
+  <!ENTITY libgusb-md5sum        "d0e4c970e2386900c99cab41d9b17e23">
+  <!ENTITY libgusb-size          "284 KB">
+  <!ENTITY libgusb-buildsize     "5.4 MB (with tests))">
+  <!ENTITY libgusb-time          "less than 0.1 SBU (with tests)">
 ]>
 
@@ -17,6 +17,6 @@
 
   <sect1info>
-    <othername>$LastChangedBy: fernando $</othername>
-    <date>$Date: 2014-11-21 17:35:29 +0100 (Pet, 21 Nov 2014) $</date>
+    <othername>$LastChangedBy: dj $</othername>
+    <date>$Date: 2016-01-24 02:01:02 -0600 (Sun, 24 Jan 2016) $</date>
   </sect1info>
 
@@ -37,5 +37,5 @@
     </para>
 
-    &lfs77_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82,5 +82,7 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gobject-introspection"/>,
+      <xref linkend="usbutils"/> (for <filename>usb.ids</filename> data file,
+      which is also required for the tests), and
       <xref linkend="vala"/>
     </para>
Index: general/genlib/qca-systemd.xml
===================================================================
--- general/genlib/qca-systemd.xml	(revision 83f6c770f5d0b55096b417f4fc5fb23412c1cc51)
+++ 	(revision )
@@ -1,194 +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 qca-download-http "http://download.kde.org/stable/qca/&qca-version;/src/qca-&qca-version;.tar.xz">
-  <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "657cc701316600199199a6b6cb2c73c9">
-  <!ENTITY qca-size          "676 KB">
-  <!ENTITY qca-buildsize     "28 MB">
-  <!ENTITY qca-time          "1.2 SBU (additional 0.3 SBU for the tests)">
-]>
-
-<sect1 id="qca" xreflabel="qca-&qca-version;">
-  <?dbhtml filename="qca.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy: krejzi $</othername>
-    <date>$Date: 2014-10-26 16:35:43 +0100 (Sun, 26 Oct 2014) $</date>
-  </sect1info>
-
-  <title>Qca-&qca-version;</title>
-
-  <indexterm zone="qca">
-    <primary sortas="a-qca">qca</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qca</title>
-
-    <para><application>Qca</application> aims to provide a straightforward
-    and cross-platform crypto API, using <application>Qt</application> datatypes
-    and conventions. <application>Qca</application> separates the API from
-    the implementation, using plugins known as Providers.</para>
-
-    &lfs78_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&qca-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&qca-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &qca-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &qca-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &qca-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &qca-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qca Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="cacerts"/>,
-    <xref linkend="cmake"/>,
-    <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
-    <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="Optional">
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="gnupg2"/>,
-    <xref linkend="libgcrypt"/>,
-    <xref linkend="libgpg-error"/>,
-    <xref linkend="nss"/>,
-    <xref linkend="nspr"/>,
-    <xref linkend="openssl"/>,
-    <xref linkend="p11-kit"/>,
-    <xref linkend="doxygen"/>, and
-    <xref linkend="which"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/qca"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qca</title>
-
-    <para>If desired, remove a lot of irritating warnings when building:</para>
-
-<screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
-
-    <para>Install <application>Qca</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;            \
-      -DCMAKE_BUILD_TYPE=Release                \
-      -DQT4_BUILD=ON                            \
-      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
-      ..                                        &amp;&amp;
-
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</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><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-    used to apply a higher level of compiler optimizations.</para>
-
-    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
-    building with Qt4 even if Qt5 is found. There are no packages in BLFS 
-    that use the Qt5 version of Qca.</para>
-
-    <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
-    Install the qca man page in the normal location.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg>
-        <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg>
-        <seg>
-          &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5),
-          &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and
-          &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mozcerts">
-        <term><command>mozcerts</command></term>
-        <listitem>
-          <para>is a command line tool for converting certdata.txt into
-          outfile.pem files.</para>
-          <indexterm zone="qca mozcerts">
-            <primary sortas="b-mozcerts">mozcerts</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcatool">
-        <term><command>qcatool</command></term>
-        <listitem>
-          <para>is a command line tool for performing various cryptographic
-          operations with Qca.</para>
-          <indexterm zone="qca qcatool">
-            <primary sortas="b-qcatool">qcatool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqca">
-        <term><filename class='libraryfile'>libqca.so</filename></term>
-        <listitem>
-          <para>is the Qt Cryptography Architecture (Qca) library.</para>
-          <indexterm zone="qca libqca">
-            <primary sortas="c-libqca">libqca.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 83f6c770f5d0b55096b417f4fc5fb23412c1cc51)
+++ general/genlib/qca.xml	(revision c4dd285f32e3683ee41ba701fd75e0cb937acc1e)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY qca-download-http "http://delta.affinix.com/download/qca/2.0/qca-&qca-version;.tar.bz2">
+  <!ENTITY qca-download-http "http://download.kde.org/stable/qca/&qca-version;/src/qca-&qca-version;.tar.xz">
   <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "c2b00c732036244701bae4853a2101cf">
-  <!ENTITY qca-size          "933 KB">
-  <!ENTITY qca-buildsize     "29.2 MB">
-  <!ENTITY qca-time          "1.9 SBU">
+  <!ENTITY qca-md5sum        "657cc701316600199199a6b6cb2c73c9">
+  <!ENTITY qca-size          "676 KB">
+  <!ENTITY qca-buildsize     "28 MB">
+  <!ENTITY qca-time          "1.2 SBU (additional 0.3 SBU for the tests)">
 ]>
 
@@ -35,5 +35,5 @@
     the implementation, using plugins known as Providers.</para>
 
-    &lfs76_checked;
+    &lfs78_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63,23 +63,22 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="cmake"/> and
-    <xref linkend="qt4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cacerts"/>
+    <xref linkend="cacerts"/>,
+    <xref linkend="cmake"/>,
+    <xref linkend="qt4"/> or <xref linkend="qt5"/>, and
+    <xref linkend="which"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cyrus-sasl"/>,
-      <xref linkend="gnupg2"/>,
-      <xref linkend="libgcrypt"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="openssl"/>,
-      <xref linkend="qt5"/>,
-      <ulink url="http://botan.randombit.net/">Botan</ulink> and
-      <ulink url="https://github.com/OpenSC/pkcs11-helper">pkcs11-helper</ulink>
+    <para role="Optional">
+    <xref linkend="cyrus-sasl"/>,
+    <xref linkend="gnupg2"/>,
+    <xref linkend="libgcrypt"/>,
+    <xref linkend="libgpg-error"/>,
+    <xref linkend="nss"/>,
+    <xref linkend="nspr"/>,
+    <xref linkend="openssl"/>,
+    <xref linkend="p11-kit"/>,
+    <xref linkend="doxygen"/>, and
+    <xref linkend="which"/>
     </para>
 
@@ -92,4 +91,8 @@
     <title>Installation of Qca</title>
 
+    <para>If desired, remove a lot of irritating warnings when building:</para>
+
+<screen><userinput>sed -i 's/BSD/DEFAULT/' CMakeLists.txt</userinput></screen>
+
     <para>Install <application>Qca</application> by running the following
     commands:</para>
@@ -98,13 +101,9 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DQT4_BUILD=ON              \
-      -DQCA_DOC_INSTALL_DIR=/usr/share/doc/qca-2.1.0            \
-      -DQCA_FEATURE_INSTALL_DIR=/usr/share/qt4/mkspecs/features \
-      -DQCA_INCLUDE_INSTALL_DIR=/usr/include/qt4                \
-      -DQCA_PRIVATE_INCLUDE_INSTALL_DIR=/usr/include/qt4        \
-      -DQCA_PLUGINS_INSTALL_DIR=/usr/lib/qt4/plugins            \
-      -Wno-dev .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&qt4-dir;            \
+      -DCMAKE_BUILD_TYPE=Release                \
+      -DQT4_BUILD=ON                            \
+      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
+      ..                                        &amp;&amp;
 
 make</userinput></screen>
@@ -116,29 +115,4 @@
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <para>
-      If <application>Qt4</application> isn't installed in
-      <filename class="directory">/usr</filename>, ensure
-      it can properly find the modules installed by this
-      package by running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>if [[ ${QT4DIR} != "/usr" ]]
-then
-   ln -sfv /usr/include/qt4/QtCrypto                  \
-           ${QT4DIR}/include/qt4/                     &amp;&amp;
-   ln -sfv /usr/share/qt4/mkspecs/features/crypto.prf \
-           ${QT4DIR}/share/qt4/mkspecs/features/      &amp;&amp;
-
-   install -v -dm755 ${QT4DIR}/lib/qt4/plugins/crypto &amp;&amp;
-
-   for file in /usr/lib/qt4/plugins/crypto/*
-   do
-       ln -sfv ${file} ${QT4DIR}/lib/qt4/plugins/crypto/
-   done &amp;&amp;
-
-   unset file
-fi</userinput></screen>
-
   </sect2>
 
@@ -146,14 +120,13 @@
     <title>Command Explanations</title>
 
-    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used 
-    to apply higher level of the compiler optimizations.</para>
-  
-    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to ensure 
-    that <application>Qt4</application> version of the library is built even if 
-    <application>Qt5</application> is present.</para>
+    <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
+    used to apply a higher level of compiler optimizations.</para>
 
-    <para><parameter>-DQCA_*_INSTALL_DIR=...</parameter>: These switches are used 
-    to ensure that files depending on the <application>Qt4</application>
-     installation prefix are installed in the correct locations.</para>
+    <para><parameter>-DQT4_BUILD=ON</parameter>: This switch is used to force
+    building with Qt4 even if Qt5 is found. There are no packages in BLFS 
+    that use the Qt5 version of Qca.</para>
+
+    <para><parameter>-DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man</parameter>:
+    Install the qca man page in the normal location.</para>
 
   </sect2>
@@ -168,14 +141,10 @@
 
       <seglistitem>
-        <seg>mozcerts and qcatool2</seg>
-        <seg>libqca.so</seg>
+        <seg>mozcerts and qcatool (if building with Qt5, the binaries have a -qt5 suffix)</seg>
+        <seg>libqca.so (libqca-qt5.so if building with Qt5) and plugins at &qt4-dir;/lib/qca/crypto</seg>
         <seg>
-          /usr/include/qt4/QtCrypto,
-          /usr/lib/cmake/Qca,
-          /usr/lib/qt4/plugins/crypto and,
-          depending on the <application>Qt4</application>
-          installation prefix,
-          $QT4DIR/include/qt4/QtCrypto and
-          $QT4DIR/lib/qt4/plugins/crypto
+          &qt4-dir;/include/QtCrypto (or &qt5-dir;/include/Qca-qt5),
+          &qt4-dir;/lib/cmake/Qca (or &qt5-dir;/lib/cmake/Qca-qt5) and
+          &qt4-dir;/lib/qca (or &qt5-dir;/lib/qca-qt5)
         </seg>
       </seglistitem>
@@ -198,11 +167,11 @@
       </varlistentry>
 
-      <varlistentry id="qcatool2">
-        <term><command>qcatool2</command></term>
+      <varlistentry id="qcatool">
+        <term><command>qcatool</command></term>
         <listitem>
           <para>is a command line tool for performing various cryptographic
-	  operations with Qca.</para>
-          <indexterm zone="qca qcatool2">
-            <primary sortas="b-qcatool2">qcatool2</primary>
+          operations with Qca.</para>
+          <indexterm zone="qca qcatool">
+            <primary sortas="b-qcatool">qcatool</primary>
           </indexterm>
         </listitem>
