Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision a70b5e46f61b336922dbf067ee85e8170b70a916)
+++ general/genlib/genlib.xml	(revision 1d054a448598f066c56432b5f5ad8b7b1e328ec7)
@@ -75,10 +75,11 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.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="libgcrypt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt-systemd.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.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="libical.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="libinput-systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libiodbc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libksba.xml"/>
Index: general/genlib/libgcrypt-systemd.xml
===================================================================
--- general/genlib/libgcrypt-systemd.xml	(revision 1d054a448598f066c56432b5f5ad8b7b1e328ec7)
+++ general/genlib/libgcrypt-systemd.xml	(revision 1d054a448598f066c56432b5f5ad8b7b1e328ec7)
@@ -0,0 +1,209 @@
+<?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 libgcrypt-download-http " ">
+  <!ENTITY libgcrypt-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
+  <!ENTITY libgcrypt-md5sum        "a5a5060dc2f80bcac700ab0236ea47dc">
+  <!ENTITY libgcrypt-size          "2.4 MB">
+  <!ENTITY libgcrypt-buildsize     "32 MB (additional 7 MB SBU for docs)">
+  <!ENTITY libgcrypt-time          "0.3 SBU (additional 0.1 SBU for docs and
+                                    0.8 SBU for tests)">
+]>
+
+<sect1 id="libgcrypt" xreflabel="libgcrypt-&libgcrypt-version;">
+  <?dbhtml filename="libgcrypt.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgcrypt-&libgcrypt-version;</title>
+
+  <indexterm zone="libgcrypt">
+    <primary sortas="a-libgcrypt">libgcrypt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgcrypt</title>
+
+    <para>
+      The <application>libgcrypt</application> package contains a general
+      purpose crypto library based on the code used in
+      <application>GnuPG</application>. The library provides a high level
+      interface to cryptographic building blocks using an extendable and flexible
+      API.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libgcrypt-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libgcrypt-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libgcrypt-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libgcrypt-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libgcrypt-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libgcrypt-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libgcrypt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libgpg-error"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="libcap-pam"/> and
+      <xref linkend="pth"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libgcrypt"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgcrypt</title>
+
+    <para>
+      Install <application>libgcrypt</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      Only <command>info</command> documentation is shipped in the package
+      tarball. If you wish to build alternate formats of the documentation,
+      (you must have <xref linkend="texlive"/> installed to build the PDF
+      and PostScript documentation), then issue the following commands:
+    </para>
+
+<screen><userinput>make -C doc pdf ps html &amp;&amp;
+makeinfo --html --no-split -o doc/gcrypt_nochunks.html doc/gcrypt.texi &amp;&amp;
+makeinfo --plaintext       -o doc/gcrypt.txt           doc/gcrypt.texi</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 &amp;&amp;
+install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
+install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*} \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
+
+    <para>
+      The shared library needs to be moved to
+      <filename class="directory">/lib</filename>, and as a result the
+      <filename class="extension">.so</filename> file in
+      <filename class="directory">/usr/lib</filename> will need to be
+      recreated. Run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen><userinput remap="install">mv -v /usr/lib/libgcrypt.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libgcrypt.so) /usr/lib/libgcrypt.so</userinput></screen>
+
+    <para>
+      If you built the additional documentation, install it by issuing the
+      following commands as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
+install -v -m644 doc/gcrypt.html/* \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
+install -v -m644 doc/gcrypt_nochunks.html \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
+install -v -m644 doc/gcrypt.{pdf,ps,dvi,txt,texi} \
+                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <option>--with-capabilities</option>: This option enables libcap2 support.
+    </para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          dumpsexp, hmac256, libgcrypt-config, and mpicalc
+        </seg>
+        <seg>
+          libgcrypt.so
+        </seg>
+        <seg>
+          /usr/share/doc/libgcrypt-&libgcrypt-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgcrypt-lib">
+        <term><filename class="libraryfile">libgcrypt.so</filename></term>
+        <listitem>
+          <para>
+            contains the cryptographic API functions.
+          </para>
+          <indexterm zone="libgcrypt libgcrypt-lib">
+            <primary sortas="c-libgcrypt">libgcrypt.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision a70b5e46f61b336922dbf067ee85e8170b70a916)
+++ 	(revision )
@@ -1,197 +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 libgcrypt-download-http " ">
-  <!ENTITY libgcrypt-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
-  <!ENTITY libgcrypt-md5sum        "a5a5060dc2f80bcac700ab0236ea47dc">
-  <!ENTITY libgcrypt-size          "2.4 MB">
-  <!ENTITY libgcrypt-buildsize     "32 MB (additional 7 MB SBU for docs)">
-  <!ENTITY libgcrypt-time          "0.3 SBU (additional 0.1 SBU for docs and
-                                    0.8 SBU for tests)">
-]>
-
-<sect1 id="libgcrypt" xreflabel="libgcrypt-&libgcrypt-version;">
-  <?dbhtml filename="libgcrypt.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libgcrypt-&libgcrypt-version;</title>
-
-  <indexterm zone="libgcrypt">
-    <primary sortas="a-libgcrypt">libgcrypt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgcrypt</title>
-
-    <para>
-      The <application>libgcrypt</application> package contains a general
-      purpose crypto library based on the code used in
-      <application>GnuPG</application>. The library provides a high level
-      interface to cryptographic building blocks using an extendable and flexible
-      API.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgcrypt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgcrypt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgcrypt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgcrypt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgcrypt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgcrypt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgcrypt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libcap-pam"/> and
-      <xref linkend="pth"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libgcrypt"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgcrypt</title>
-
-    <para>
-      Install <application>libgcrypt</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Only <command>info</command> documentation is shipped in the package
-      tarball. If you wish to build alternate formats of the documentation,
-      (you must have <xref linkend="texlive"/> installed to build the PDF
-      and PostScript documentation), then issue the following commands:
-    </para>
-
-<screen><userinput>make -C doc pdf ps html &amp;&amp;
-makeinfo --html --no-split -o doc/gcrypt_nochunks.html doc/gcrypt.texi &amp;&amp;
-makeinfo --plaintext       -o doc/gcrypt.txt           doc/gcrypt.texi</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 &amp;&amp;
-install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
-install -v -m644    README doc/{README.apichanges,fips*,libgcrypt*} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
-
-    <para>
-      If you built the additional documentation, install it by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>install -v -dm755   /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
-install -v -m644 doc/gcrypt.html/* \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;/html &amp;&amp;
-install -v -m644 doc/gcrypt_nochunks.html \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version; &amp;&amp;
-install -v -m644 doc/gcrypt.{pdf,ps,dvi,txt,texi} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-capabilities</option>: This option enables libcap2 support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          dumpsexp, hmac256, libgcrypt-config, and mpicalc
-        </seg>
-        <seg>
-          libgcrypt.so
-        </seg>
-        <seg>
-          /usr/share/doc/libgcrypt-&libgcrypt-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgcrypt-lib">
-        <term><filename class="libraryfile">libgcrypt.so</filename></term>
-        <listitem>
-          <para>
-            contains the cryptographic API functions.
-          </para>
-          <indexterm zone="libgcrypt libgcrypt-lib">
-            <primary sortas="c-libgcrypt">libgcrypt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgpg-error-systemd.xml
===================================================================
--- general/genlib/libgpg-error-systemd.xml	(revision 1d054a448598f066c56432b5f5ad8b7b1e328ec7)
+++ general/genlib/libgpg-error-systemd.xml	(revision 1d054a448598f066c56432b5f5ad8b7b1e328ec7)
@@ -0,0 +1,196 @@
+<?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 libgpg-error-download-http " ">
+  <!ENTITY libgpg-error-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
+  <!ENTITY libgpg-error-md5sum        "fe0cfa7e15262ef8fdeee366109e9ff6">
+  <!ENTITY libgpg-error-size          "484 KB">
+  <!ENTITY libgpg-error-buildsize     "6.9 MB">
+  <!ENTITY libgpg-error-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libgpg-error" xreflabel="libgpg-error-&libgpg-error-version;">
+  <?dbhtml filename="libgpg-error.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgpg-error-&libgpg-error-version;</title>
+
+  <indexterm zone="libgpg-error">
+    <primary sortas="a-libgpg-error">libgpg-error</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgpg-error</title>
+
+    <para>
+      The <application>libgpg-error</application> package contains a
+      library that defines common error values for all
+      <application>GnuPG</application> components.
+    .</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libgpg-error-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libgpg-error-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libgpg-error-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libgpg-error-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libgpg-error-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libgpg-error-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libgpg-error"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgpg-error</title>
+
+    <para>
+      Install <application>libgpg-error</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 &amp;&amp;
+install -v -m644 -D README /usr/share/doc/libgpg-error-&libgpg-error-version;/README</userinput></screen>
+
+    <para>
+      The shared library needs to be moved to
+      <filename class="directory">/lib</filename>, and as a result the
+      <filename class="extension">.so</filename> file in
+      <filename class="directory">/usr/lib</filename> will need to be
+      recreated. Run the following command as the
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen><userinput remap="install">mv -v /usr/lib/libgpg-error.so.* /lib
+ln -sfv ../../lib/$(readlink /usr/lib/libgpg-error.so) /usr/lib/libgpg-error.so</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 Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          gpg-error and gpg-error-config
+        </seg>
+        <seg>
+          libgpg-error.so
+        </seg>
+        <seg>
+          /usr/share/common-lisp and
+          /usr/share/doc/libgpg-error-&libgpg-error-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="gpg-error">
+        <term><command>gpg-error</command></term>
+        <listitem>
+          <para>
+            is used to determine <application>libgpg-error</application>
+            error codes.
+          </para>
+          <indexterm zone="libgpg-error gpg-error">
+            <primary sortas="b-gpg-error">gpg-error</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gpg-error-config">
+        <term><command>gpg-error-config</command></term>
+        <listitem>
+          <para>
+            is a utility used to configure and build applications based on
+            the <application>libgpg-error</application> library. It can be used
+            to query the C compiler and linker flags which are required to
+            correctly compile and link the application against the
+            <application>libgpg-error</application> library.
+          </para>
+          <indexterm zone="libgpg-error gpg-error-config">
+            <primary sortas="b-gpg-error-config">gpg-error-config</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libgpg-error-lib">
+        <term><filename class="libraryfile">libgpg-error.so</filename></term>
+        <listitem>
+          <para>
+            contains the <application>libgpg-error</application> API
+            functions.
+          </para>
+          <indexterm zone="libgpg-error libgpg-error-lib">
+            <primary sortas="c-libgpg-error">libgpg-error.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/libgpg-error.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision a70b5e46f61b336922dbf067ee85e8170b70a916)
+++ 	(revision )
@@ -1,184 +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 libgpg-error-download-http " ">
-  <!ENTITY libgpg-error-download-ftp  "ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
-  <!ENTITY libgpg-error-md5sum        "fe0cfa7e15262ef8fdeee366109e9ff6">
-  <!ENTITY libgpg-error-size          "484 KB">
-  <!ENTITY libgpg-error-buildsize     "6.9 MB">
-  <!ENTITY libgpg-error-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libgpg-error" xreflabel="libgpg-error-&libgpg-error-version;">
-  <?dbhtml filename="libgpg-error.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libgpg-error-&libgpg-error-version;</title>
-
-  <indexterm zone="libgpg-error">
-    <primary sortas="a-libgpg-error">libgpg-error</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgpg-error</title>
-
-    <para>
-      The <application>libgpg-error</application> package contains a
-      library that defines common error values for all
-      <application>GnuPG</application> components.
-    .</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgpg-error-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgpg-error-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgpg-error-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgpg-error-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgpg-error-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgpg-error-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/libgpg-error"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgpg-error</title>
-
-    <para>
-      Install <application>libgpg-error</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 &amp;&amp;
-install -v -m644 -D README /usr/share/doc/libgpg-error-&libgpg-error-version;/README</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 Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gpg-error and gpg-error-config
-        </seg>
-        <seg>
-          libgpg-error.so
-        </seg>
-        <seg>
-          /usr/share/common-lisp and
-          /usr/share/doc/libgpg-error-&libgpg-error-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gpg-error">
-        <term><command>gpg-error</command></term>
-        <listitem>
-          <para>
-            is used to determine <application>libgpg-error</application>
-            error codes.
-          </para>
-          <indexterm zone="libgpg-error gpg-error">
-            <primary sortas="b-gpg-error">gpg-error</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpg-error-config">
-        <term><command>gpg-error-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            the <application>libgpg-error</application> library. It can be used
-            to query the C compiler and linker flags which are required to
-            correctly compile and link the application against the
-            <application>libgpg-error</application> library.
-          </para>
-          <indexterm zone="libgpg-error gpg-error-config">
-            <primary sortas="b-gpg-error-config">gpg-error-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgpg-error-lib">
-        <term><filename class="libraryfile">libgpg-error.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgpg-error</application> API
-            functions.
-          </para>
-          <indexterm zone="libgpg-error libgpg-error-lib">
-            <primary sortas="c-libgpg-error">libgpg-error.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libinput-systemd.xml
===================================================================
--- general/genlib/libinput-systemd.xml	(revision 1d054a448598f066c56432b5f5ad8b7b1e328ec7)
+++ general/genlib/libinput-systemd.xml	(revision 1d054a448598f066c56432b5f5ad8b7b1e328ec7)
@@ -0,0 +1,180 @@
+<?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 libinput-download-http "http://www.freedesktop.org/software/libinput/libinput-&libinput-version;.tar.xz">
+  <!ENTITY libinput-download-ftp  " ">
+  <!ENTITY libinput-md5sum        "60969c60e11792fab4ecaa7222f43697">
+  <!ENTITY libinput-size          "388 KB">
+  <!ENTITY libinput-buildsize     "8.0 MB">
+  <!ENTITY libinput-time          "0.1 SBU">
+]>
+
+<sect1 id="libinput" xreflabel="libinput-&libinput-version;">
+  <?dbhtml filename="libinput.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libinput-&libinput-version;</title>
+
+  <indexterm zone="libinput">
+    <primary sortas="a-libinput">libinput</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libinput</title>
+
+    <para>
+      <application>libinput</application> is a library that handles
+      input devices for display servers and other applications that
+      need to directly deal with input devices.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libinput-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libinput-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libinput-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libinput-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libinput-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libinput-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libinput Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="libevdev"/> and
+      <xref linkend="mtdev"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="check"/>,
+      <xref linkend="doxygen"/>, and
+      <xref linkend="gtk3"/> (to build the GUI event viewer)
+      <!-- <xref linkend="valgrind"/> broken -->
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libinput"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libinput</title>
+
+    <para>
+      Install <application>libinput</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      If you have the optional <xref linkend="check"/> package installed,
+      the regression tests can be run as the <systemitem 
+      class="username">root</systemitem> user with
+      <userinput>make -C test check-TESTS</userinput>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>
+      If <xref linkend="doxygen"/> was present during the build, you
+      can install the generated documentation by running the following
+      command as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755 /usr/share/doc/libinput-&libinput-version; &amp;&amp;
+cp -rv doc/html/* /usr/share/doc/libinput-&libinput-version;</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 Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libinput.so
+        </seg>
+        <seg>
+          /usr/share/doc/libinput-&libinput-version;
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libinput-lib">
+        <term><filename class="libraryfile">libinput.so</filename></term>
+        <listitem>
+          <para>
+            contains API functions for handling input devices.
+          </para>
+          <indexterm zone="libinput libinput-lib">
+            <primary sortas="c-libinput">libinput.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
