Index: general/genlib/abseil-cpp.xml
===================================================================
--- general/genlib/abseil-cpp.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,269 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 abseil-cpp-download-http "https://github.com/abseil/abseil-cpp/releases/download/&abseil-cpp-version;/abseil-cpp-&abseil-cpp-version;.tar.gz">
-  <!ENTITY abseil-cpp-md5sum        "f2c807858166b0a8ce4f679b17111335">
-  <!ENTITY abseil-cpp-size          "2.1 MB">
-  <!ENTITY abseil-cpp-buildsize     "31 MB">
-  <!ENTITY abseil-cpp-time          "0.8 SBU">
-]>
-
-<sect1 id="abseil-cpp" xreflabel="Abseil-cpp-&abseil-cpp-version;">
-  <?dbhtml filename="abseil-cpp.html"?>
-
-  <title>Abseil-cpp-&abseil-cpp-version;</title>
-
-  <indexterm zone="abseil-cpp">
-    <primary sortas="a-abseil-cpp">Abseil-cpp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Abseil-cpp</title>
-
-    <para>
-      The <application>Abseil-cpp</application> package contains a series of
-      libraries designed to augment the C++ standard library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&abseil-cpp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &abseil-cpp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &abseil-cpp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &abseil-cpp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &abseil-cpp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Abseil-cpp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Abseil-cpp</title>
-
-    <para>
-      Install <application>Abseil-cpp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DABSL_PROPAGATE_CXX_STD=ON \
-      -DBUILD_SHARED_LIBS=ON      \
-      -GNinja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DABSL_PROPAGATE_CXX_STD=ON</parameter>: This parameter
-      enables propagating C++ features to targets that link to this package's
-      libraries.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter builds
-      shared versions of the libraries provided by this package instead of
-      static libraries.
-    </para>
-
-  </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>
-          libabsl_bad_any_cast_impl.so,
-          libabsl_bad_optional_access.so,
-          libabsl_bad_variant_access.so,
-          libabsl_base.so,
-          libabsl_city.so,
-          libabsl_civil_time.so,
-          libabsl_cord_internal.so,
-          libabsl_cord.so,
-          libabsl_cordz_functions.so,
-          libabsl_cordz_handle.so,
-          libabsl_cordz_info.so,
-          libabsl_cordz_sample_token.so,
-          libabsl_crc32c.so,
-          libabsl_crc_cord_state.so,
-          libabsl_crc_cpu_detect.so,
-          libabsl_crc_internal.so,
-          libabsl_debugging_internal.so,
-          libabsl_demangle_internal.so,
-          libabsl_die_if_null.so,
-          libabsl_examine_stack.so,
-          libabsl_exponential_biased.so,
-          libabsl_failure_signal_handler.so,
-          libabsl_flags_commandlineflag_internal.so,
-          libabsl_flags_commandlineflag.so,
-          libabsl_flags_config.so,
-          libabsl_flags_internal.so,
-          libabsl_flags_marshalling.so,
-          libabsl_flags_parse.so,
-          libabsl_flags_private_handle_accessor.so,
-          libabsl_flags_program_name.so,
-          libabsl_flags_reflection.so,
-          libabsl_flags_usage_internal.so,
-          libabsl_flags_usage.so,
-          libabsl_graphcycles_internal.so,
-          libabsl_hash.so,
-          libabsl_hashtablez_sampler.so,
-          libabsl_int128.so,
-          libabsl_kernel_timeout_internal.so,
-          libabsl_leak_check.so,
-          libabsl_log_entry.so,
-          libabsl_log_flags.so,
-          libabsl_log_globals.so,
-          libabsl_log_initalize.so,
-          libabsl_log_internal_check_op.so,
-          libabsl_log_internal_conditions.so,
-          libabsl_log_internal_fnmatch.so,
-          libabsl_log_internal_format.so,
-          libabsl_log_internal_globals.so,
-          libabsl_log_internal_log_sink_set.so,
-          libabsl_log_internal_message.so,
-          libabsl_log_internal_nullguard.so,
-          libabsl_log_internal_proto.so,
-          libabsl_log_severity.so,
-          libabsl_log_sink.so,
-          libabsl_low_level_hash.so,
-          libabsl_malloc_internal.so,
-          libabsl_periodic_sampler.so,
-          libabsl_random_distributions.so,
-          libabsl_random_internal_distribution_test_util.so,
-          libabsl_random_internal_platform.so,
-          libabsl_random_internal_pool_urbg.so,
-          libabsl_random_internal_randen_hwaes_impl.so,
-          libabsl_random_internal_randen_hwaes.so,
-          libabsl_random_internal_randen_slow.so,
-          libabsl_random_internal_randen.so,
-          libabsl_random_internal_seed_material.so,
-          libabsl_random_seed_gen_exception.so,
-          libabsl_random_seed_sequences.so,
-          libabsl_raw_hash_set.so,
-          libabsl_raw_logging_internal.so,
-          libabsl_scoped_set_env.so,
-          libabsl_spinlock_wait.so,
-          libabsl_stacktrace.so,
-          libabsl_statusor.so,
-          libabsl_status.so,
-          libabsl_strerror.so,
-          libabsl_str_format_internal.so,
-          libabsl_strings_internal.so,
-          libabsl_strings.so,
-          libabsl_string_view.so,
-          libabsl_symbolize.so,
-          libabsl_synchronization.so,
-          libabsl_throw_delegate.so,
-          libabsl_time.so,
-          libabsl_time_zone.so, and
-          libabsl_vlog_config_internal.so
-        </seg>
-        <seg>
-          /usr/include/absl,
-          /usr/lib/cmake/absl
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="PROGRAM1">
-        <term><command>PROGRAM1</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM1">
-            <primary sortas="b-PROGRAM1">PROGRAM1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="PROGRAM2">
-        <term><command>PROGRAM2</command></term>
-        <listitem>
-          <para>
-            does this ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE PROGRAM2">
-            <primary sortas="b-PROGRAM2">PROGRAM2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libLIBRARY1">
-        <term><filename class="libraryfile">libLIBRARY1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that ..... (no period at the end)
-          </para>
-          <indexterm zone="TEMPLATE libLIBRARY1">
-            <primary sortas="c-libLIBRARY1">libLIBRARY1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    -->
-  </sect2>
-</sect1>
Index: general/genlib/appstream.xml
===================================================================
--- general/genlib/appstream.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,286 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 appstream-download-http "https://www.freedesktop.org/software/appstream/releases/AppStream-&appstream-version;.tar.xz">
-  <!ENTITY appstream-download-ftp  " ">
-  <!ENTITY appstream-md5sum        "00e749276887f816b6d68a7a150e6c97">
-  <!ENTITY appstream-size          "2.5 MB">
-  <!ENTITY appstream-buildsize     "27 MB">
-  <!ENTITY appstream-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="appstream" xreflabel="AppStream-&appstream-version;">
-  <?dbhtml filename="appstream.html"?>
-
-  <title>AppStream-&appstream-version;</title>
-
-  <indexterm zone="appstream">
-    <primary sortas="a-appstream">AppStream</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to AppStream</title>
-
-    <para>
-      The <application>AppStream</application> package contains a library and
-      tool that is useful for retrieving software metadata and making it
-      easily accessible to programs which need it.
-    </para>
-
-    <!-- Remember to update the org.linuxfromscratch.lfs.xml file in
-         configuration section when tagging this.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&appstream-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&appstream-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &appstream-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &appstream-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &appstream-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &appstream-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">AppStream Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="itstool"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="libxmlb"/>, and
-      <xref linkend="libyaml"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      &qt5-deps;,
-      <xref linkend="qt6"/>,
-      <ulink url="https://github.com/openSUSE/daps">DAPS</ulink>, and
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-    </para>
-
-    <!--  Only use this if you want to note something in the wiki
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/TEMPLATE"/>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of AppStream</title>
-
-    <para>
-      Install <application>AppStream</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dapidocs=false     \
-            -Dstemming=false    .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-mv -v /usr/share/doc/appstream{,-&appstream-version;}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dapidocs=false</parameter>: This switch disables building the
-      API documentation. Remove it if you have
-      <xref linkend="gi-docgen" role="nodep"/> installed and wish to
-      regenerate the API documentation.  When the API documentation is
-      not regenerated, a pre-built copy is installed anyway.
-    </para>
-
-    <para>
-      <parameter>-Dstemming=false</parameter>: This switch disables stemming
-      support. Remove this switch if you have
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-      installed and want faster searches.
-    </para>
-    
-    <para>
-      <option>-Dqt5=true</option>: Use this option if you have &qt5-deps;
-      installed and you want to build support for Qt-5 applications into this
-      package.
-    </para>
-    
-    <para>
-      <option>-Dqt=true</option>: Use this option if you have
-      <xref linkend="qt6" role="nodep"/> installed and you want to build support
-      for Qt6 applications into this package. This option conflicts with
-      <option>-Dqt5=true</option>.
-    </para>
-
-  </sect2>
-  
-  <sect2 role="configuration">
-    <title>Configuring AppStream</title>
-
-    <sect3 id="appstream-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/usr/share/metainfo/org.linuxfromscratch.lfs.xml</filename>
-      </para>
-    </sect3>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        <application>AppStream</application> expects an operating system
-        metainfo file describing the GNU/Linux distribution.  As the
-        &root; user, create the file describing LFS:
-      </para>
-
-      <indexterm zone="appstream appstream-config">
-        <primary sortas="e-usr-share-metainfo-org-linuxfromscratch-lfs-xml">
-          /usr/share/metainfo/org.linuxfromscratch.lfs.xml
-        </primary>
-      </indexterm>
-
-      <screen role="root"><userinput>install -vdm755 /usr/share/metainfo &amp;&amp;
-cat > /usr/share/metainfo/org.linuxfromscratch.lfs.xml &lt;&lt; EOF
-<literal>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;component type="operating-system"&gt;
-  &lt;id&gt;org.linuxfromscratch.lfs&lt;/id&gt;
-  &lt;name&gt;Linux From Scratch&lt;/name&gt;
-  &lt;summary&gt;A customized Linux system built entirely from source&lt;/summary&gt;
-  &lt;description&gt;
-    &lt;p&gt;
-      Linux From Scratch (LFS) is a project that provides you with
-      step-by-step instructions for building your own customized Linux
-      system entirely from source.
-    &lt;/p&gt;
-  &lt;/description&gt;
-  &lt;url type="homepage"&gt;https://www.linuxfromscratch.org/lfs/&lt;/url&gt;
-  &lt;metadata_license&gt;MIT&lt;/metadata_license&gt;
-  &lt;developer id='linuxfromscratch.org'&gt;
-    &lt;name&gt;The Linux From Scratch Editors&lt;/name&gt;
-  &lt;/developer&gt;
-
-  &lt;releases&gt;
-    &lt;release version="12.2" type="development" date="2024-09-01"&gt;
-      &lt;description&gt;
-        &lt;p&gt;The next release of Linux From Scratch.&lt;/p&gt;
-      &lt;/description&gt;
-    &lt;/release&gt;
-
-    &lt;release version="12.1" type="stable" date="2024-03-01"&gt;
-      &lt;description&gt;
-        &lt;p&gt;Now contains Binutils 2.42, GCC-13.2.0, Glibc-2.39, and Linux
-        kernel 6.7.&lt;/p&gt;
-      &lt;/description&gt;
-    &lt;/release&gt;
-  &lt;/releases&gt;
-&lt;/component&gt;</literal>
-EOF</userinput></screen>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          appstreamcli
-        </seg>
-        <seg>
-          libappstream.so
-        </seg>
-        <seg>
-          /usr/include/appstream,
-          /usr/share/doc/appstream-&version;, and
-          /usr/share/installed-tests/appstream
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="appstreamcli">
-        <term><command>appstreamcli</command></term>
-        <listitem>
-          <para>
-            queries information from AppStream metadata and from the AppStream
-            component index
-          </para>
-          <indexterm zone="appstream appstreamcli">
-            <primary sortas="b-appstreamcli">appstreamcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libappstream">
-        <term><filename class="libraryfile">libappstream.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that handle AppStream metadata queries and
-            request information from the AppStream component index
-          </para>
-          <indexterm zone="appstream libappstream">
-            <primary sortas="c-libappstream">libappstream.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/apr-util.xml
===================================================================
--- general/genlib/apr-util.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,210 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 apr-util-download-http
-           "https://archive.apache.org/dist/apr/apr-util-&apr-util-version;.tar.bz2">
-  <!ENTITY apr-util-download-ftp  " ">
-  <!ENTITY apr-util-md5sum        "b6e8c9b31d938fe5797ceb0d1ff2eb69">
-  <!ENTITY apr-util-size          "423 KB">
-  <!ENTITY apr-util-buildsize     "7.6 MB (add 1.4 MB for tests)">
-  <!ENTITY apr-util-time          "less than 0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="apr-util" xreflabel="Apr-Util-&apr-util-version;">
-  <?dbhtml filename="apr-util.html"?>
-
-
-  <title>Apr-Util-&apr-util-version;</title>
-
-  <indexterm zone="apr-util">
-    <primary sortas="a-Apr-Util">Apr-Util</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apr Util</title>
-
-    <para>
-      The Apache Portable Runtime Utility Library provides a predictable and
-      consistent interface to underlying client library interfaces. This
-      application programming interface assures predictable if not identical
-      behavior regardless of which libraries are available on a given platform.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apr-util-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apr-util-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apr-util-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apr-util-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apr-util-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apr-util-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Apr Util Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="apr"/>
-    </para>
-<!--
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="openssl"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
-      <xref linkend="mariadb"/> or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="openldap"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unixodbc"/>, and
-      &berkeley-db;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apr Util</title>
-
-    <para>
-      Install <application>Apr Util</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr       \
-            --with-apr=/usr     \
-            --with-gdbm=/usr    \
-            --with-openssl=/usr \
-            --with-crypto &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -j1 test</command>.
-      One test, testdbm, is known to fail.
-    </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>--with-gdbm=/usr</parameter>: This switch enables the
-      <filename class="libraryfile">apr_dbm_gdbm-1.so</filename> plugin.
-    </para>
-
-    <para>
-      <parameter>--with-openssl=/usr</parameter>
-      <parameter>--with-crypto</parameter>: These
-      switches enable the
-      <filename class="libraryfile">apr_crypto_openssl-1.so</filename>
-      plugin.
-    </para>
-
-    <para>
-      <option>--with-berkeley-db=/usr</option>: If you have installed
-      &berkeley-db;, use this switch to compile the
-      <filename class="libraryfile">apr_dbm_db-1.so</filename> plugin.
-    </para>
-
-    <para>
-      <option>--with-ldap</option>: If you have installed
-      <xref linkend="openldap"/>, use this switch to compile the
-      <filename class="libraryfile">apr_ldap.so</filename> plugin.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          apu-1-config
-        </seg>
-        <seg>
-          libaprutil-1.so
-        </seg>
-        <seg>
-          /usr/lib/apr-util-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apu-1-config">
-        <term><command>apu-1-config</command></term>
-        <listitem>
-          <para>
-            is an APR-util script designed to allow easy command line access to
-            APR-util configuration parameters
-          </para>
-          <indexterm zone="apr-util apu-1-config">
-            <primary sortas="b-apu-1-config">apu-1-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaprutil-1">
-        <term><filename class="libraryfile">libaprutil-1.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a predictable and consistent
-            interface to underlying client library interfaces
-          </para>
-          <indexterm zone="apr-util libaprutil-1">
-            <primary sortas="c-libaprutil-1">libaprutil-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/apr.xml
===================================================================
--- general/genlib/apr.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 apr-download-http
-    "https://archive.apache.org/dist/apr/apr-&apr-version;.tar.bz2">
-  <!ENTITY apr-download-ftp  " ">
-  <!ENTITY apr-md5sum        "f8a62f3984898ba0ea8b6f26b851cb99">
-  <!ENTITY apr-size          "876 KB">
-  <!ENTITY apr-buildsize     "11 MB (additional 4 MB for the tests)">
-  <!ENTITY apr-time          "0.1 SBU (add 1.4 SBU for tests)">
-]>
-
-<sect1 id="apr" xreflabel="Apr-&apr-version;">
-  <?dbhtml filename="apr.html"?>
-
-
-  <title>Apr-&apr-version;</title>
-
-  <indexterm zone="apr">
-    <primary sortas="a-apr">Apr</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Apr</title>
-
-    <para>
-      The Apache Portable Runtime (APR) is a supporting library for the
-      Apache web server. It provides a set of application programming interfaces
-      (APIs) that map to the underlying Operating System (OS). Where the OS
-      doesn't support a particular function, APR will provide an emulation. Thus
-      programmers can use the APR to make a program portable across different
-      platforms.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&apr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&apr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &apr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &apr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &apr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &apr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Apr</title>
-
-<!--
-    <para>
-      First, fix a security issue:
-    </para>
-<!- -
-<screen><userinput>sed '/{306/a \
-\
-    if (xt-&gt;tm_mon &lt; 0 || xt-&gt;tm_mon &gt;= 12) \
-        return APR_EBADDATE;' -i time/unix/time.c</userinput></screen>
-- ->
-<screen><userinput>sed -e "/shift/i \
-\    if (xt-&gt;tm_mon &lt; 0 || xt-&gt;tm_mon &gt;= 12) return APR_EBADDATE;" \
-    -i time/unix/time.c</userinput></screen>
--->
-<!--
-    <para>
-      Fix an issue checking a location in a script template:
-    </para>
-<screen><userinput>sed -e '/^case "$0"/s;$0;$(readlink -f $0);' \
-    -i apr-config.in</userinput></screen>
--->
-    <para>
-      Install <application>Apr</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --with-installbuilddir=/usr/share/apr-1/build &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>. <!-- teststr is
-      known to hang on some systems. - WORKS AS OF 1.6.5 (renodr) -->
-    </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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          apr-1-config
-        </seg>
-        <seg>
-          libapr-1.so
-        </seg>
-        <seg>
-          /usr/include/apr-1 and
-          /usr/share/apr-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apr-1-config">
-        <term><command>apr-1-config</command></term>
-        <listitem>
-          <para>
-            is a shell script used to retrieve information about the apr
-            library in the system. It is typically used to compile and link
-            against the library
-          </para>
-          <indexterm zone="apr apr-1-config">
-            <primary sortas="b-apr-1-config">apr-1-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libapr-1">
-        <term><filename class="libraryfile">libapr-1.so</filename></term>
-        <listitem>
-          <para>
-            is the Apache Portable Runtime library
-          </para>
-          <indexterm zone="apr libapr-1">
-            <primary sortas="c-libapr-1">libapr-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/aspell.xml
===================================================================
--- general/genlib/aspell.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,380 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 aspell-download-http "&gnu-http;/aspell/aspell-&aspell-version;.tar.gz">
-  <!ENTITY aspell-download-ftp  " ">
-  <!ENTITY aspell-en-dict       "aspell6-en-2020.12.07-0">
-  <!ENTITY aspell-en-dict-url   "&gnu-http;/aspell/dict/en/&aspell-en-dict;.tar.bz2">
-  <!ENTITY aspell-md5sum        "187bd142f522ada555c7aa6b9cbf56e6">
-  <!ENTITY aspell-size          "3.4 MB">
-  <!ENTITY aspell-buildsize     "41 MB (Additional 8 MB for EN dictionary)">
-  <!ENTITY aspell-time          "0.4 SBU">
-]>
-
-<sect1 id="aspell" xreflabel="Aspell-&aspell-version;">
-  <?dbhtml filename="aspell.html"?>
-
-
-  <title>Aspell-&aspell-version;</title>
-
-  <indexterm zone="aspell">
-    <primary sortas="a-Aspell">Aspell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Aspell</title>
-
-    <para>
-      The <application>Aspell</application> package contains an interactive
-      spell checking program and the <application>Aspell</application>
-      libraries. <application>Aspell</application> can either be used as a
-      library or as an independent spell checker.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&aspell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&aspell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &aspell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &aspell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &aspell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &aspell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <para>
-      You'll need to download at least one dictionary. The English dictionary
-      is given as an example below. Dictionaries in many other languages can be
-      found at <ulink url="&gnu-http;/aspell/dict"/>.
-    </para>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Aspell English dictionary: <ulink url="&aspell-en-dict-url;"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Aspell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/> (for the dictionaries)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Aspell</title>
-
-    <para>
-      Install <application>Aspell</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 &amp;&amp;
-ln -svfn aspell-0.60 /usr/lib/aspell &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/aspell-&aspell-version;/aspell{,-dev}.html &amp;&amp;
-
-install -v -m644 manual/aspell.html/* \
-    /usr/share/doc/aspell-&aspell-version;/aspell.html &amp;&amp;
-
-install -v -m644 manual/aspell-dev.html/* \
-    /usr/share/doc/aspell-&aspell-version;/aspell-dev.html</userinput></screen>
-
-    <para>
-      If you do not plan to install <application>Ispell</application>, then copy
-      the wrapper script <command>ispell</command>:
-    </para>
-
-<screen role="root"><userinput>install -v -m 755 scripts/ispell /usr/bin/</userinput></screen>
-
-    <para>
-      If you do not plan to install <application>Spell</application>, then copy
-      the wrapper script <command>spell</command>:
-    </para>
-
-<screen role="root"><userinput>install -v -m 755 scripts/spell /usr/bin/</userinput></screen>
- </sect2>
-
- <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>ln -svfn aspell-0.60 /usr/lib/aspell</command>: This command is
-      useful for configuration of other applications, such as
-      <xref linkend="enchant"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Aspell</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        After <application>Aspell</application> is installed, you must set up at
-        least one dictionary. Install the English dictionary by running the
-        following commands:
-      </para>
-
-<screen><userinput>tar xf ../&aspell-en-dict;.tar.bz2 &amp;&amp;
-cd &aspell-en-dict;                &amp;&amp;
-
-./configure &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-      <para>
-        Other dictionaries can be installed with the same instructions.
-      </para>
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          aspell, aspell-import, precat, preunzip, prezip, prezip-bin,
-          pspell-config, run-with-aspell, word-list-compress and optionally,
-          ispell and spell.
-        </seg>
-        <seg>libaspell.so and libpspell.so</seg>
-        <seg>/usr/include/pspell and /usr/lib/aspell-0.60</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="aspell-prog">
-        <term><command>aspell</command></term>
-        <listitem>
-          <para>
-            is a utility that can function as an <command>ispell -a</command>
-            replacement, as an independent spell checker, as a test utility to
-            test out <application>Aspell</application> features, and as a
-            utility for managing dictionaries
-          </para>
-          <indexterm zone="aspell aspell-prog">
-            <primary sortas="b-aspell">aspell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-ispell">
-        <term><command>ispell</command></term>
-        <listitem>
-          <para>
-            is a wrapper around <command>aspell</command> to invoke it in
-            <command>ispell</command> compatible mode
-          </para>
-          <indexterm zone="aspell aspell-ispell">
-            <primary sortas="b-ispell">ispell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-spell">
-        <term><command>spell</command></term>
-        <listitem>
-          <para>
-            is a wrapper around <command>aspell</command> to invoke it in
-            <command>spell</command> compatible mode
-          </para>
-          <indexterm zone="aspell aspell-spell">
-            <primary sortas="b-spell">spell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aspell-import">
-        <term><command>aspell-import</command></term>
-        <listitem>
-          <para>
-            imports old personal dictionaries into
-            <application>Aspell</application>
-          </para>
-          <indexterm zone="aspell aspell-import">
-            <primary sortas="b-aspell-import">aspell-import</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="precat">
-        <term><command>precat</command></term>
-        <listitem>
-          <para>
-            decompresses a <command>prezip</command>ped file to stdout
-          </para>
-          <indexterm zone="aspell precat">
-            <primary sortas="b-precat">precat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="preunzip">
-        <term><command>preunzip</command></term>
-        <listitem>
-          <para>
-            decompresses a <command>prezip</command>ped file
-          </para>
-          <indexterm zone="aspell preunzip">
-            <primary sortas="b-preunzip">preunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prezip">
-        <term><command>prezip</command></term>
-        <listitem>
-          <para>
-            is a prefix delta compressor, used to compress sorted word lists or
-            other similar text files
-          </para>
-          <indexterm zone="aspell prezip">
-            <primary sortas="b-prezip">prezip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prezip-bin">
-        <term><command>prezip-bin</command></term>
-        <listitem>
-          <para>
-            is called by the various wrapper scripts to perform the actual
-            compressing and decompressing
-          </para>
-          <indexterm zone="aspell prezip-bin">
-            <primary sortas="b-prezip-bin">prezip-bin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pspell-config">
-        <term><command>pspell-config</command></term>
-        <listitem>
-          <para>
-            displays information about the
-            <filename class="libraryfile">libpspell</filename> installation,
-            mostly for use in build scripts
-          </para>
-          <indexterm zone="aspell pspell-config">
-            <primary sortas="b-pspell-config">pspell-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="run-with-aspell">
-        <term><command>run-with-aspell</command></term>
-        <listitem>
-          <para>
-            is a script to help use <application>Aspell</application> as an
-            <command>ispell</command> replacement
-          </para>
-          <indexterm zone="aspell run-with-aspell">
-            <primary sortas="b-run-with-aspell">run-with-aspell</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="word-list-compress">
-        <term><command>word-list-compress</command></term>
-        <listitem>
-          <para>
-            compresses or decompresses sorted word lists for use with the
-            <application>Aspell</application> spell checker
-          </para>
-          <indexterm zone="aspell word-list-compress">
-            <primary sortas="b-word-list-compress">word-list-compress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libaspell">
-        <term><filename class="libraryfile">libaspell.so</filename></term>
-        <listitem>
-          <para>
-            contains spell checking API functions
-          </para>
-          <indexterm zone="aspell libaspell">
-            <primary sortas="c-libaspell">libaspell.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpspell">
-        <term><filename class="libraryfile">libpspell.so</filename></term>
-        <listitem>
-          <para>
-            is an interface to the
-            <filename class="libraryfile">libaspell</filename> library. All the
-            spell checking functionality is now in
-            <filename class="libraryfile">libaspell</filename> but this library
-            is included for backward compatibility
-          </para>
-          <indexterm zone="aspell libpspell">
-            <primary sortas="c-libpspell">libpspell.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/boost.xml
===================================================================
--- general/genlib/boost.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,234 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 boost-download-http "https://github.com/boostorg/boost/releases/download/boost-&boost-version;/boost-&boost-dl-version;.tar.xz">
-  <!ENTITY boost-download-ftp  " ">
-  <!ENTITY boost-md5sum        "eff463ec1c67a8725fb3d2948abc5ca5">
-  <!ENTITY boost-size          "90 MB">
-  <!ENTITY boost-buildsize     "899 MB (197 MB installed)">
-  <!ENTITY boost-time          "1.8 SBU (Using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="boost" xreflabel="Boost-&boost-version;">
-  <?dbhtml filename="boost.html"?>
-
-  <title>boost-&boost-version;</title>
-
-  <indexterm zone="boost">
-    <primary sortas="a-Boost">Boost</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Boost</title>
-
-    <para>
-      <application>Boost</application> provides a set of free peer-reviewed
-      portable C++ source libraries. It includes libraries for linear algebra,
-      pseudorandom number generation, multithreading, image processing, regular
-      expressions and unit testing.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        This package will extract to the 
-        <filename>boost-&boost-version;</filename>/ directory.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&boost-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&boost-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &boost-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &boost-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &boost-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &boost-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-    <!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Recommended patch, required to build <xref linkend="libreoffice"/>:
-          <ulink url="&patch-root;/boost-&boost-version;-gcc_10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-    -->
-
-    <bridgehead renderas="sect3">Boost Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="icu"/> and
-      <ulink url="https://www.open-mpi.org/">Open MPI</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/boost"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Boost</title>
-
-    <para>
-      This package can be built with several jobs running in parallel. In
-      the instructions below, <parameter>&lt;N&gt;</parameter> stands for the
-      number of jobs. Install <application>Boost</application> by running the
-      following commands:
-    </para>
-
-
-<screen><userinput>./bootstrap.sh --prefix=/usr --with-python=python3 &amp;&amp;
-./b2 stage -j<replaceable>&lt;N&gt;</replaceable> threading=multi link=shared</userinput></screen>
-
-    <para>
-      To run Boost.Build's regression tests, issue
-      <command>pushd tools/build/test; python3 test_all.py; popd</command>.
-    </para>
-
-    <para>
-      To run every library's regression tests, issue <command>pushd status;
-      ../b2; popd</command>.  A few tests may fail. They take a very long time
-      (over 119 SBU at -j4) and use a very large amount of disk space
-      (46 GB). You should use the <parameter>-jN</parameter> switch to
-      speed them up.
-    </para>
-
-    <note>
-      <para>
-        Boost installs many versioned directories in /usr/lib/cmake.
-        If a new version of <application>Boost</application> is installed over a
-        previous version, the older cmake directories need to be
-        explicitly removed.  To do this, run as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>rm -rf /usr/lib/cmake/[Bb]oost*</userinput></screen>
-
-      <para>
-        before installing the new version.
-      </para>
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- dev note: ./b2 - -prefix=<DESTDIR>/usr install threading=multi link=shared -->
-
-<screen role="root"><userinput>./b2 install threading=multi link=shared</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-<!--
-    <para>
-      <command>sed -i '/#include ...</command>: This removes the inclusion
-      of <filename>boost/phoenix/stl/tuple.hpp</filename> from this header-only
-      library, allowing applications which use it to link using recent C++.
-    </para>
--->
-    <para>
-      <parameter>threading=multi</parameter>: This parameter ensures that
-      <application>Boost</application> is built with multithreading support.
-    </para>
-
-    <para>
-      <parameter>link=shared</parameter>: This parameter ensures that only
-      shared libraries are created, except for libboost_exception and
-      libboost_test_exec_monitor which are created as static. Most people
-      will not need the static libraries, and most programs using
-      <application>Boost</application> only use the headers. Omit
-      this parameter if you do need static libraries.
-    </para>
-
-    <para>
-      <parameter>--with-python=python3</parameter>: This switch ensures Python3
-      is used if Python2 is installed.
-    </para>
-
-    <para>
-       <option>-jN</option>: This switch may be added to the
-       <command>b2</command> command lines, to run up to N processes in
-       parallel.
-    </para>
-
-  </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>
-          libboost_atomic.so, libboost_charconv.so, libboost_chrono.so,
-          libboost_container.so, libboost_context.so, libboost_contract.so,
-          libboost_coroutine.so, libboost_date_time.so, libboost_exception.a,
-          libboost_fiber.so, libboost_filesystem.so, libboost_graph.so,
-          libboost_iostreams.so, libboost_json.so, libboost_locale.so,
-          libboost_log_setup.so, libboost_log.so, libboost_math_c99.so,
-          libboost_math_c99f.so, libboost_math_c99l.so, libboost_math_tr1.so,
-          libboost_math_tr1f.so, libboost_math_tr1l.so,
-          libboost_nowide.so, libboost_numpy3&python3-minor;.so,
-          libboost_prg_exec_monitor.so, libboost_program_options.so,
-          libboost_python3&python3-minor;.so, libboost_random.so,
-          libboost_regex.so, libboost_serialization.so,
-          libboost_stacktrace_addr2line.so, libboost_stacktrace_basic.so,
-          libboost_stacktrace_noop.so, libboost_system.so,
-          libboost_test_exec_monitor.a, libboost_thread.so, libboost_timer.so,
-          libboost_type_erasure.so, libboost_unit_test_framework.so,
-          libboost_url.so, libboost_wave.so, and libboost_wserialization.so
-        </seg>
-        <seg>
-          /usr/include/boost
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/brotli.xml
===================================================================
--- general/genlib/brotli.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,244 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 brotli-download-http "https://github.com/google/brotli/archive/v&brotli-version;/brotli-&brotli-version;.tar.gz">
-  <!ENTITY brotli-download-ftp  " ">
-  <!ENTITY brotli-md5sum        "3a6a3dba82a3604792d3cb0bd41bca60">
-  <!ENTITY brotli-size          "500 KB">
-  <!ENTITY brotli-buildsize     "33 MB (with python3 bindings)">
-  <!-- The python tests for this package are broken.  The tarball is missing a lot of test files -->
-  <!ENTITY brotli-time          "0.3 SBU (with python3 bindings; parallelism=4)">
-]>
-
-<sect1 id="brotli" xreflabel="Brotli-&brotli-version;">
-  <?dbhtml filename="brotli.html"?>
-
-
-  <title>brotli-&brotli-version;</title>
-
-  <indexterm zone="brotli">
-    <primary sortas="a-brotli">Brotli</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Brotli</title>
-
-    <para>
-      <application>Brotli</application> provides a general-purpose lossless
-      compression algorithm that compresses data using a combination of a
-      modern variant of the LZ77 algorithm, Huffman coding and 2nd order
-      context modeling. Its libraries are particularly used for WOFF2 fonts
-      on webpages.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&brotli-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&brotli-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &brotli-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &brotli-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &brotli-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &brotli-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Brotli Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!--<xref linkend="pluggy"/> and-->
-      <!-- Pluggy is a required dependency of pytest -->
-      <xref linkend="pytest"/> (for testing Python3 bindings)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Brotli</title>
-
-    <para>
-      Install <application>brotli</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      ..  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-    </para>
-
-<!--  These are broken
-    <para>
-      The python tests are missing most of the necessary testdata files and
-      therefore 240 of 311 tests fail.
-      If you nevertheless wish to test the bindings, go back to the top-level directory and
-      issue: <command>python3 setup.py test</command>.
-    </para>
--->
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If desired, build the <application>Python3</application>
-      bindings:
-    </para>
-
-<screen><userinput>cd .. &amp;&amp;
-sed "/c\/.*\.[ch]'/d;\
-     /include_dirs=\[/\
-     i libraries=['brotlicommon','brotlidec','brotlienc']," \
-    -i setup.py &amp;&amp;
-&build-wheel-cmd; $PWD</userinput></screen>
-
-    <para>
-      Install the <application>Python3</application>
-      bindings as the &root; user:
-    </para>
-
-<screen role="root"><userinput>&install-wheel; Brotli</userinput></screen>
-
-    <!-- "131 passed in 2.76s" for me with 1.1.0 -->
-    <para>
-      To test the <application>Python3</application> binding, issue:
-      <command>pytest</command>.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <!-- https://github.com/google/brotli/issues/933 -->
-    <para>
-      <command>sed ... -i setup.py</command>: Stop
-      <filename>setup.py</filename> from rebuilding the entire package all
-      over again, use the already installed libraries for the
-      <application>Python3</application> binding instead.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          brotli
-        </seg>
-        <seg>
-          libbrotlicommon.so,
-          libbrotlidec.so, and
-          libbrotlienc.so
-        </seg>
-        <seg>
-          /usr/include/brotli and
-          /usr/lib/python&python3-majorver;/site-packages/Brotli-&brotli-version;.dist-info
-          (if you built and installed the Python3 bindings)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="brotli-prog">
-        <term><command>brotli</command></term>
-        <listitem>
-          <para>
-            can compress or decompress files, or test the integrity of
-            compressed files
-          </para>
-          <indexterm zone="brotli brotli-prog">
-            <primary sortas="b-brotli">brotli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlicommon">
-        <term><filename class="libraryfile">libbrotlicommon{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli common dictionary library
-          </para>
-          <indexterm zone="brotli libbrotlicommon">
-            <primary sortas="c-libbrotlicommon">libbrotlicommon{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlidec">
-        <term><filename class="libraryfile">libbrotlidec{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli decoder library
-          </para>
-          <indexterm zone="brotli libbrotlidec">
-            <primary sortas="c-libbrotlidec">libbrotlidec{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbrotlienc">
-        <term><filename class="libraryfile">libbrotlienc{-static.a,.so}</filename></term>
-        <listitem>
-          <para>
-            is the Brotli common encoder library
-          </para>
-          <indexterm zone="brotli libbrotlienc">
-            <primary sortas="c-libbrotlienc">libbrotlienc{,-static.a,.so}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/clucene.xml
===================================================================
--- general/genlib/clucene.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 clucene-download-http "&sourceforge-dl;/clucene/clucene-core-&clucene-version;.tar.gz">
-  <!ENTITY clucene-download-ftp  " ">
-  <!ENTITY clucene-md5sum        "48d647fbd8ef8889e5a7f422c1bfda94">
-  <!ENTITY clucene-size          "2.2 MB">
-  <!ENTITY clucene-buildsize     "78 MB">
-  <!ENTITY clucene-time          "0.8 SBU">
-]>
-
-<sect1 id="clucene" xreflabel="CLucene-&clucene-version;">
-  <?dbhtml filename="clucene.html"?>
-
-
-  <title>CLucene-&clucene-version;</title>
-
-  <indexterm zone="clucene">
-    <primary sortas="a-clucene">clucene</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to CLucene</title>
-
-    <para>
-      <application>CLucene</application> is a C++ version of Lucene, a
-      high performance text search engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&clucene-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&clucene-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &clucene-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &clucene-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &clucene-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &clucene-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required patch: <ulink
-          url="&patch-root;/clucene-&clucene-version;-contribs_lib-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">CLucene Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CLucene</title>
-
-    <para>
-      Install <application>CLucene</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../clucene-&clucene-version;-contribs_lib-1.patch &amp;&amp;
-
-sed -i '/Misc.h/a #include &lt;ctime&gt;' src/core/CLucene/document/DateTools.cpp &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_CONTRIBS_LIB=ON .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_CONTRIBS_LIB=ON</parameter>: This cmake variable
-      enables building the CLucene contribs library necessary for running
-      applications that use language specific text analyzers like LibreOffice
-      for example.
-    </para>
-
-  </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>
-          libclucene-contribs-lib.so,
-          libclucene-core.so, and
-          libclucene-shared.so
-        </seg>
-        <seg>
-          /usr/include/CLucene and
-          /usr/lib/CLuceneConfig.cmake
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/dbus-glib.xml
===================================================================
--- general/genlib/dbus-glib.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 dbus-glib-download-http "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-&dbus-glib-version;.tar.gz">
-  <!ENTITY dbus-glib-download-ftp  " ">
-  <!ENTITY dbus-glib-md5sum        "021e6c8a288df02c227e4aafbf7e7527">
-  <!ENTITY dbus-glib-size          "700 KB">
-  <!ENTITY dbus-glib-buildsize     "12 MB (with tests)">
-  <!ENTITY dbus-glib-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="dbus-glib" xreflabel="dbus-glib-&dbus-glib-version;">
-  <?dbhtml filename="dbus-glib.html"?>
-
-
-  <title>dbus-glib-&dbus-glib-version;</title>
-
-  <indexterm zone="dbus-glib">
-    <primary sortas="a-dbus-glib">dbus-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to D-Bus GLib</title>
-
-    <para>
-      The <application>D-Bus GLib</application> package contains
-      <application>GLib</application> interfaces to the
-      <application>D-Bus</application> API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&dbus-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&dbus-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &dbus-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &dbus-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &dbus-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &dbus-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">D-Bus GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/> and
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of D-Bus GLib</title>
-
-    <para>
-      Install <application>D-Bus GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr     \
-            --sysconfdir=/etc \
-            --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. Note that
-      more comprehensive tests can be run by following the same method used in
-      <application>D-Bus</application> instructions, which requires building the
-      package twice.
-    </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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          dbus-binding-tool
-        </seg>
-        <seg>
-          libdbus-glib-1.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/dbus-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glib-dbus-binding-tool">
-        <term><command>dbus-binding-tool</command></term>
-        <listitem>
-          <para>
-            is a tool used to interface with the D-Bus API
-          </para>
-          <indexterm zone="dbus-glib glib-dbus-binding-tool">
-            <primary sortas="b-dbus-binding-tool">dbus-binding-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdbus-glib-1">
-        <term><filename class="libraryfile">libdbus-glib-1.so</filename></term>
-        <listitem>
-          <para>
-            contains <application>GLib</application> interface functions
-            to the <application>D-Bus</application> API
-          </para>
-          <indexterm zone="dbus-glib libdbus-glib-1">
-            <primary sortas="c-libdbus-glib-1">libdbus-glib-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/double-conversion.xml
===================================================================
--- general/genlib/double-conversion.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 double-conversion-download-http "https://github.com/google/double-conversion/archive/v&double-conversion-version;/double-conversion-&double-conversion-version;.tar.gz">
-  <!ENTITY double-conversion-download-ftp  " ">
-  <!ENTITY double-conversion-md5sum        "b344abb64084a4a1d98a43e67752989b">
-  <!ENTITY double-conversion-size          "6.7 MB">
-  <!ENTITY double-conversion-buildsize     "62 MB (with tests)">
-  <!ENTITY double-conversion-time          "0.1 SBU (with tests)">
-
-]>
-
-<sect1 id="double-conversion" xreflabel="double-conversion-&double-conversion-version;">
-  <?dbhtml filename="double-conversion.html"?>
-
-
-  <title>Double-conversion-&double-conversion-version;</title>
-
-  <indexterm zone="double-conversion">
-    <primary sortas="a-double-conversion">double-conversion</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Double-conversion</title>
-
-    <para>
-      The <application>Double-conversion</application> package contains a
-      library that facilitates binary-to-decimal and decimal-to-binary routines
-      for IEEE doubles.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&double-conversion-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&double-conversion-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &double-conversion-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &double-conversion-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &double-conversion-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &double-conversion-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Double-conversion Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Double-conversion</title>
-
-    <para>
-      Install <application>Double-conversion</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_SHARED_LIBS=ON      \
-      -DBUILD_TESTING=ON          \
-      ..                          &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>-DBUILD_SHARED_LIBS=ON</parameter>: This switch forces cmake to build
-      a shared version of the library instead of the static version.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_TESTING=ON</parameter>: This switch builds the test programs.
-    </para>
-  </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>
-          libdouble-conversion.so
-        </seg>
-        <seg>
-          /usr/include/double-conversion
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdouble-conversion">
-        <term><filename class="libraryfile">libdouble-conversion.so</filename></term>
-        <listitem>
-          <para>
-            provides binary-to-decimal and decimal-to-binary routines for IEEE doubles
-          </para>
-          <indexterm zone="double-conversion libdouble-conversion">
-            <primary sortas="c-libdouble-conversion">libdouble-conversion.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/duktape.xml
===================================================================
--- general/genlib/duktape.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 duktape-download-http "https://duktape.org/duktape-&duktape-version;.tar.xz">
-  <!ENTITY duktape-download-ftp  " ">
-  <!ENTITY duktape-md5sum        "b3200b02ab80125b694bae887d7c1ca6">
-  <!ENTITY duktape-size          "1003 KB">
-  <!ENTITY duktape-buildsize     "25 MB">
-  <!ENTITY duktape-time          "0.3 SBU">
-]>
-
-<sect1 id="duktape" xreflabel="duktape-&duktape-version;">
-  <?dbhtml filename="duktape.html"?>
-
-
-  <title>duktape-&duktape-version;</title>
-
-  <indexterm zone="duktape">
-    <primary sortas="a-duktape">duktape</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to duktape</title>
-
-    <para>
-      <application>duktape</application> is an embeddable Javascript
-      engine, with a focus on portability and compact footprint.
-    </para>
-
-    <!-- To editors: make sure polkit works with duktape before
-         tagging duktape.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&duktape-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&duktape-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &duktape-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &duktape-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &duktape-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &duktape-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of duktape</title>
-
-    <para>
-      Install <application>duktape</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>sed -i 's/-Os/-O2/' Makefile.sharedlibrary
-make -f Makefile.sharedlibrary INSTALL_PREFIX=/usr</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -f Makefile.sharedlibrary INSTALL_PREFIX=/usr 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>
-          libduktape.so and libduktaped.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libduktape.so">
-        <term><filename class="libraryfile">libduktape.so</filename></term>
-        <listitem>
-          <para>
-            is an embeddable Javascript engine
-          </para>
-          <indexterm zone="duktape">
-            <primary sortas="c-duktape">libduktape.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/enchant.xml
===================================================================
--- general/genlib/enchant.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,261 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 enchant-download-http "https://github.com/AbiWord/enchant/releases/download/v&enchant-version;/enchant-&enchant-version;.tar.gz">
-  <!ENTITY enchant-download-ftp  " ">
-  <!ENTITY enchant-md5sum        "5da2afd6cf92027b4871824d4da4afbf">
-  <!ENTITY enchant-size          "5.5 MB">
-  <!ENTITY enchant-buildsize     "20 MB (add 63 MB for tests)">
-  <!ENTITY enchant-time          "0.1 SBU (add 0.8 SBU for tests)">
-]>
-
-<sect1 id="enchant" xreflabel="enchant-&enchant-version;">
-  <?dbhtml filename="enchant.html"?>
-
-
-  <title>enchant-&enchant-version;</title>
-
-  <indexterm zone="enchant">
-    <primary sortas="a-enchant">enchant</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to enchant</title>
-
-    <para>
-      The <application>enchant</application> package provides a generic
-      interface into various existing spell checking libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&enchant-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&enchant-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &enchant-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &enchant-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &enchant-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &enchant-time;
-         </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">enchant Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="aspell"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="dbus-glib"/>,
-      <xref linkend="doxygen"/>,
-      <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
-      <ulink url="https://hunspell.github.io/">Hunspell</ulink>,
-      <ulink url="https://nuspell.github.io/">Nuspell</ulink>,
-      <ulink url="https://hunspell.github.io/">Voikko</ulink>, and
-      <ulink url="https://github.com/unittest-cpp/unittest-cpp/releases">
-        unittest-cpp</ulink> (required for tests)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of enchant</title>
-
-    <para>
-      First, remove a generated file that causes the build to fail.
-      The file will be regenerated for the current system.
-    </para>
-
-<screen><userinput>rm -f src/api.c</userinput></screen>
-
-    <para>
-      Install <application>enchant</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir /usr/share/doc/enchant-&enchant-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run tests, unittest-cpp must be installed and the
-      <option>--enable-relocatable</option> option passed to configure above.
-      If these conditions are present, the tests may be run with <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"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring enchant</title>
-
-    <sect3 id="enchant-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.enchant</filename> and
-        <filename>/usr/share/enchant/enchant.ordering</filename>
-      </para>
-
-      <indexterm zone="enchant enchant-config">
-        <primary sortas="e-AA.enchant">~/.enchant</primary>
-      </indexterm>
-
-      <indexterm zone="enchant enchant-config">
-        <primary
-        sortas="e-usr-share-enchant-enchant.ordering">/usr/share/enchant/enchant.ordering</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-<!--
-   Looks like this is not required when installing enchant in the flavor
-   we do above. Leaving it in source (for a while) in case I'm wrong and
-   it needs to be restored.
-      <para>
-        If you wish to use the <xref linkend="aspell"/> backend, create a
-        symlink, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ln -svfn ../../lib/aspell /usr/share/enchant/aspell</userinput></screen>
--->
-      <para>
-        You can test your installation and configuration by creating a test
-        file and running the following commands (you can replace the
-        en_GB dictionary by any other downloaded when installing <xref
-        linkend="aspell"/>):
-      </para>
-
-<screen remap="test"><userinput>cat &gt; /tmp/test-enchant.txt &lt;&lt; "EOF"
-<literal>Tel me more abot linux
-Ther ar so many commads</literal>
-EOF
-
-enchant-2 -d en_GB -l /tmp/test-enchant.txt &amp;&amp;
-enchant-2 -d en_GB -a /tmp/test-enchant.txt</userinput></screen>
-
-      <para>
-        You will see a list of the misspelled words followed by a list of
-        alternatives for them.
-      </para>
-
-      <para>
-        See more details in the enchant manual page.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>enchant-2 and enchant-lsmod-2</seg>
-        <seg>libenchant-2.so</seg>
-        <seg>/usr/include/enchant-2, /usr/lib/enchant-2,
-          /usr/share/enchant, and /usr/share/doc/enchant-&enchant-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="enchant-2">
-        <term><command>enchant-2</command></term>
-        <listitem>
-          <para>
-            is a spellchecker
-          </para>
-          <indexterm zone="enchant enchant-2">
-            <primary sortas="b-enchant-2">enchant-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="enchant-lsmod-2">
-        <term><command>enchant-lsmod-2</command></term>
-        <listitem>
-          <para>
-            lists available backends, languages, and dictionaries
-          </para>
-          <indexterm zone="enchant enchant-lsmod-2">
-            <primary sortas="b-enchant-lsmod-2">enchant-lsmod-2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libenchant-2">
-        <term><filename class="libraryfile">libenchant-2.so</filename></term>
-        <listitem>
-          <para>
-            contains spell checking interface API functions
-          </para>
-          <indexterm zone="enchant libenchant-2">
-            <primary sortas="c-libenchant-2">libenchant-2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/exempi.xml
===================================================================
--- general/genlib/exempi.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 exempi-download-http "https://libopenraw.freedesktop.org/download/exempi-&exempi-version;.tar.xz">
-  <!ENTITY exempi-download-ftp  " ">
-  <!ENTITY exempi-md5sum        "51fe14c2a5fa44816ba8187c6ad87d78">
-  <!ENTITY exempi-size          "2.7 MB">
-  <!ENTITY exempi-buildsize     "289 MB (add 236 MB for tests)">
-  <!ENTITY exempi-time          "0.4 SBU (add 0.6 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="exempi" xreflabel="Exempi-&exempi-version;">
-  <?dbhtml filename="exempi.html"?>
-
-
-  <title>Exempi-&exempi-version;</title>
-
-  <indexterm zone="exempi">
-    <primary sortas="a-Exempi">Exempi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Exempi</title>
-
-    <para>
-      <application>Exempi</application> is an implementation of XMP (Adobe's
-      Extensible Metadata Platform).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&exempi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&exempi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &exempi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &exempi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &exempi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &exempi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Exempi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="boost"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="required">
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Exempi</title>
-
-    <para>
-      If you intend to run the regression tests, first remove a test
-      that depends on an apparently proprietary Adobe SDK:
-    </para>
-
-<screen><userinput>sed -i -r '/^\s?testadobesdk/d' exempi/Makefile.am &amp;&amp;
-autoreconf -fiv</userinput></screen>
-
-
-    <para>
-      Install <application>Exempi</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>.<!--
-      If valgrind is installed, mosts tests will indicate a failure, but
-      that is a test problem and not a package problem.-->
-    </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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>exempi</seg>
-        <seg>libexempi.so</seg>
-        <seg>/usr/include/exempi-2.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="exempi-prog">
-        <term><command>exempi</command></term>
-        <listitem>
-          <para>
-            is a command line tool to manipulate XMP metadata
-          </para>
-          <indexterm zone="exempi exempi-prog">
-            <primary sortas="b-exempi">exempi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexempi">
-        <term><filename class="libraryfile">libexempi.so</filename></term>
-        <listitem>
-          <para>
-            is a library used to parse XMP metadata
-          </para>
-          <indexterm zone="exempi libexempi">
-            <primary sortas="c-libexempi">libexempi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/fftw.xml
===================================================================
--- general/genlib/fftw.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,339 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fftw-download-http "https://www.fftw.org/fftw-&fftw-version;.tar.gz">
-  <!ENTITY fftw-download-ftp  " ">
-  <!ENTITY fftw-md5sum        "8ccbf6a5ea78a16dbc3e1306e234cc5c">
-  <!ENTITY fftw-size          "4.0 MB">
-  <!ENTITY fftw-buildsize     "59 MB">
-  <!ENTITY fftw-time          "1.6 SBU (add 3.4 SBU for tests, both using parallelism=4)">
-]>
-
-<sect1 id="fftw" xreflabel="fftw-&fftw-version;">
-  <?dbhtml filename="fftw.html"?>
-
-
-  <title>fftw-&fftw-version;</title>
-
-  <indexterm zone="fftw">
-    <primary sortas="a-fftw">fftw</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fftw</title>
-
-    <para>
-      FFTW is a C subroutine library for computing the discrete Fourier
-      transform (DFT) in one or more dimensions, of arbitrary input size, and
-      of both real and complex data (as well as of even/odd data, i.e. the
-      discrete cosine/sine transforms or DCT/DST).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fftw-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fftw-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fftw-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fftw-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fftw-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fftw-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fftw</title>
-
-    <note>
-      <para>
-        We build fftw three times for different libraries in different
-        numerical precisions: the default double precision floating point, the
-        older 32-bit (single precision) version named float which sacrifices
-        precision for speed, and the long double which offers increased
-        precision at the cost of slower execution.
-      </para>
-    </note>
-
-    <para>
-      The first build is for double precision arithmetic.  Install
-      <application>fftw</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-sse2    \
-            --enable-avx     \
-            --enable-avx2    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      On 32-bit systems, the tests can take substantially longer than
-      they would on 64-bit machines.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Now build single precision:
-    </para>
-
-<screen><userinput>make clean &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-sse2    \
-            --enable-avx     \
-            --enable-avx2    \
-            --enable-float   &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, build long double precision:
-    </para>
-
-<screen><userinput>make clean &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --enable-threads \
-            --enable-long-double &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      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>--enable-shared</parameter>
-        <parameter>--disable-static</parameter>: Use shared
-        libs instead of static libs.
-      </para>
-
-      <para>
-        <parameter>--enable-threads</parameter>: This enables <filename
-        class="libraryfile"> libfftw3_threads.so</filename> to be compiled.
-        It is used by e.g. the <application>gimp</application> plugin from
-        <ulink url="https://gmic.eu/">G'MIC</ulink>.
-      </para>
-
-      <para>
-        <parameter>--enable-{sse2,avx,avx2}</parameter>: These enables building
-        the optimized routines using SSE2, AVX, and AVX2 instructions.  FFTW
-        will check if these routines can be really used on the current CPU when
-        the FFTW library is loaded, so a FFTW build with these routines enabled
-        can still run on a CPU without SSE2, AVX, or AVX512.  These options
-        are not compatible with <parameter>--enable-long-double</parameter>.
-      </para>
-
-      <para>
-        <parameter>--enable-float</parameter>: This enables building the library that
-        uses single precision floating point arithmetic.  It is faster but less
-        precise than the default double precision library.  The library will be
-        called <filename class="libraryfile">libfftw3f.so</filename> needed by
-        <xref linkend="pulseaudio"/>.
-      </para>
-
-      <para>
-        <parameter>--enable-long-double</parameter>: This enables building the
-        library that uses higher precision long-double floating point arithmetic.
-        The library will be called <filename
-        class="libraryfile">libfftw3l.so</filename>.
-      </para>
-
-      <para>
-        <option>--enable-avx512</option>: This enables building the optimized
-        routines using AVX512F instructions.  FFTW will check if these routines
-        can be really used on the current CPU when the FFTW library is loaded,
-        so a FFTW build with these routines enabled can still run on a CPU
-        without AVX512F.  Use this option if the FFTW build will be used on
-        a CPU with AVX512F.  This option is not compatible with
-        <parameter>--enable-long-double</parameter>.
-      </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          fftw-wisdom and fftw-wisdom-to-conf
-        </seg>
-        <seg>
-          libfftw3.so, libfftw3_threads.so, libfftw3f.so,
-          libfftw3f_threads.so, libfftw3l.so and libfftw3l_threads.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fftw-wisdom">
-        <term><command>fftw-wisdom</command></term>
-        <listitem>
-          <para>
-            is a utility to generate FFTW wisdom files, which contain saved
-            information about how to optimally compute (Fourier) transforms  of
-            various sizes
-          </para>
-          <indexterm zone="fftw fftw-wisdom">
-            <primary sortas="b-fftw-wisdom">fftw-wisdom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fftw-wisdom-to-conf">
-        <term><command>fftw-wisdom-to-conf</command></term>
-        <listitem>
-          <para>
-            is a utility to generate C configuration routines from FFTW wisdom
-            files, where the latter contain saved information about  how  to
-            optimally  compute  (Fourier)  transforms of various sizes
-          </para>
-          <indexterm zone="fftw fftw-wisdom-to-conf">
-            <primary sortas="b-fftw-wisdom-to-conf">fftw-wisdom-to-conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3">
-        <term><filename class="libraryfile">libfftw3.so</filename></term>
-        <listitem>
-          <para>
-            is the Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3">
-            <primary sortas="c-libfftw3">libfftw3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3_threads">
-        <term><filename class="libraryfile">libfftw3_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3_threads">
-            <primary sortas="c-libfftw3_threads">libfftw3_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3f">
-        <term><filename class="libraryfile">libfftw3f.so</filename></term>
-        <listitem>
-          <para>
-            is the single-precision Fast Fourier Transform library, described
-            as <quote>float</quote> for historic reasons
-          </para>
-          <indexterm zone="fftw libfftw3f">
-            <primary sortas="c-libfftw3f">libfftw3f.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3f_threads">
-        <term><filename class="libraryfile">libfftw3f_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded single-precision Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3f_threads">
-            <primary sortas="c-libfftw3f_threads">libfftw3f_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3l">
-        <term><filename class="libraryfile">libfftw3l.so</filename></term>
-        <listitem>
-          <para>
-            is the long double Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3l">
-            <primary sortas="c-libfftw3l">libfftw3l.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfftw3l_threads">
-        <term><filename class="libraryfile">libfftw3l_threads.so</filename></term>
-        <listitem>
-          <para>
-            is the threaded long double Fast Fourier Transform library
-          </para>
-          <indexterm zone="fftw libfftw3l_threads">
-            <primary sortas="c-libfftw3l_threads">libfftw3l_threads.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/fmt.xml
===================================================================
--- general/genlib/fmt.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 fmt-download-http "https://github.com/fmtlib/fmt/archive/&fmt-version;/fmt-&fmt-version;.tar.gz">
-  <!ENTITY fmt-download-ftp  " ">
-  <!ENTITY fmt-md5sum        "dc09168c94f90ea890257995f2c497a5">
-  <!ENTITY fmt-size          "836 KB">
-  <!ENTITY fmt-buildsize     "4.5 MB (add 40 MB for tests)">
-  <!ENTITY fmt-time          "less than 0.1 SBU (add 0.2 SBU for tests)">
-]>
-
-<sect1 id="fmt" xreflabel="fmt-&fmt-version;">
-  <?dbhtml filename="fmt.html"?>
-
-
-  <title>fmt-&fmt-version;</title>
-
-  <indexterm zone="fmt">
-    <primary sortas="a-fmt">fmt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to fmt</title>
-
-    <para>
-      The <application>fmt</application> package is an open-source formatting
-      library providing a fast and safe alternative to C stdio and C++
-      iostreams.</para>
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fmt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fmt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fmt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fmt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fmt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fmt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Fmt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of fmt</title>
-
-    <para>
-      Install <application>fmt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-      -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DFMT_TEST=OFF                  \
-      -G Ninja ..                     &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have enabled tests, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DFMT_TEST=OFF</parameter>: This switch initializes 
-      the package tests.  Set to ON if you wish to run tests.
-    </para>
-
-  </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>
-          libfmt.so
-        </seg>
-        <seg>
-          /usr/include/fmt and
-          /usr/lib/cmake/fmt
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ general/genlib/genlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,179 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter 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;
-]>
+<chapter id="general-genlib">
+<?dbhtml filename="genlib.html" dir="general"?>
+<title>General Libraries</title>
 
-<chapter id="general-genlib">
-  <?dbhtml filename="genlib.html"?>
+<para>Libraries contain code which is often required by more than
+one program.  This has the advantage that each program doesn't need to
+duplicate code (and risk introducing bugs), it just has to call
+functions from the libraries installed on the system.  The most obvious
+example of a set of libraries is glibc which is installed during the LFS
+book.  This contains all of the C library functions which programs
+use.</para>
 
-  <title>General Libraries</title>
+<para>There are two types of library, static and shared.  Shared
+libraries (usually libXXX.so) are loaded into memory from the shared
+copy at runtime (hence the name).  Static libraries (libXXX.a) are
+actually linked into the program executable file itself, thus making the
+program file larger.  Quite often, you will find both static and shared
+copies of the same library on your system.</para>
 
-  <para>
-    Libraries contain code which is often required by more than
-    one program.  This has the advantage that each program doesn't need to
-    duplicate code (and risk introducing bugs), it just has to call
-    functions from the libraries installed on the system.  The most obvious
-    example of a set of libraries is <application>Glibc</application> which is
-    installed during the LFS book.  This contains all of the
-    <application>C</application> library functions which programs use.
-  </para>
+<para>Generally, you only need to install libraries when you are
+installing software which requires functionality which they supply.  In
+the BLFS book, each package is listed with a list of (known)
+dependencies.  Thus, you can figure out which libraries you need to have
+before installing that program.  If you are installing something without
+using BLFS instructions, usually the <filename>README</filename>  or
+<filename>INSTALL</filename> file will contain details of the programs
+requirements.</para>
 
-  <para>
-    There are two types of libraries: static and shared.  Shared libraries
-    (usually <filename>libXXX.so</filename>) are loaded into memory from the
-    shared copy at runtime (hence the name).  Static libraries (<filename>
-    libXXX.a</filename>) are actually linked into the program executable file
-    itself, thus making the program file larger.  Quite often, you will find
-    both static and shared copies of the same library on your system.
-  </para>
+<para>There are certain libraries which nearly
+<emphasis>everyone</emphasis> will need at some point.  In this chapter
+we list these and some others and explain why you may want to install
+them.</para>
 
-  <para>
-    Generally, you only need to install libraries when you are
-    installing software that needs the functionality they supply.  In
-    the BLFS book, each package is presented with a list of (known)
-    dependencies.  Thus, you can figure out which libraries you need to have
-    before installing that program.  If you are installing something without
-    using BLFS instructions, usually the <filename>README</filename> or
-    <filename>INSTALL</filename> file will contain
-    details of the program's requirements.
-  </para>
-
-  <para>
-    There are certain libraries which nearly <emphasis>everyone</emphasis> will
-    need at some point.  In this chapter these and some others are listed and
-    it is explained why you may want to install them.
-  </para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="abseil-cpp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appstream.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="apr-util.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="boost.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="brotli.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clucene.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="double-conversion.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="duktape.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="enchant.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="exempi.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fftw.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fmt.xml"/>
-
-<!-- systemd only -->
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcab.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glib2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glibmm2.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmime3.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="gspell.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="highway.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="inih.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intel-gmmlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jansson.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-c.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="json-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keyutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kirigami-addons.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libaio.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libarchive.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libassuan.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatasmart.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libatomic_ops.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libblockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libbytesize.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcloudproviders.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.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="libdaemon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdisplay-info.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="libesmtp.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgcrypt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgrss.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="libgudev.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libidn2.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"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liblinear.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libmbim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnvme.xml"/>
-
-   <!-- systemd only -->
-  <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnfsidmap.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpaper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libportal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libptytty.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqalculate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libqmi.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libseccomp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc++3.xml"/>
-<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigc3.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsigsegv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libssh2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libstatgrab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtasn1.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuninameslist.xml"/> -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunique.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunistring.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libunwind.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="liburcu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb.xml"/>
-<!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libusb-compat.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libuv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxkbcommon.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxml2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxmlb.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxslt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwacom.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libyaml.xml"/>
-
-<!-- systemd only -->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libzeitgeist.xml"/> -->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="log4cplus.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lzo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mtdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nodejs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="npth.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nspr.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openobex.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pcre2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="popt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="protobuf-c.xml"/>
-<!--  <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.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qcoro.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="spidermonkey.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="spirv-tools.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="telepathy-glib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uchardet.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="umockdev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="utfcpp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wayland-protocols.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="wv.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xapian.xml"/>
+&zlib;
+&openssl;
+&pcre;
+&popt;
+&slang;
+&libfam;
+&libxml;
+&libxml2;
+&libxslt;
 
 </chapter>
Index: general/genlib/glib2.xml
===================================================================
--- general/genlib/glib2.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,794 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glib2-download-http "&gnome-download-http;/glib/&glib2-minor;/glib-&glib2-version;.tar.xz">
-  <!ENTITY glib2-download-ftp  " ">
-  <!ENTITY glib2-md5sum        "3a51e2803ecd22c2dadcd07d9475ebe3">
-  <!ENTITY glib2-size          "5.3 MB">
-  <!ENTITY glib2-buildsize     "130 MB (add 20 MB for tests)">
-  <!ENTITY glib2-time          "0.8 SBU (add 0.5 SBU for tests; both using parallelism=4)">
-
-  <!ENTITY gobject-introspection-download-http
-    "&gnome-download-http;/gobject-introspection/1.80/gobject-introspection-&gobject-introspection-version;.tar.xz">
-  <!ENTITY gobject-introspection-md5sum        "ef1496a7a7abfcd31d25b3459ea86ebb">
-  <!ENTITY gobject-introspection-size          "1.0 MB">
-]>
-
-<sect1 id="glib2" xreflabel="GLib-&glib2-version;">
-  <?dbhtml filename="glib2.html"?>
-
-
-  <title>GLib-&glib2-version;</title>
-
-  <indexterm zone="glib2">
-    <primary sortas="a-GLib2">GLib2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLib</title>
-
-    <para>
-      The <application>GLib</application> package contains low-level
-      libraries useful for providing data structure handling for C, portability
-      wrappers and interfaces for runtime functionality such as an
-      event loop, threads, dynamic loading and an object system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glib2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glib2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glib2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glib2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glib2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glib2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-
-    <para>
-      <emphasis role="strong">GObject Introspection (Recommended)</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download: <ulink url="&gobject-introspection-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gobject-introspection-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gobject-introspection-size;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para>
-      <emphasis role="strong">Patch for Log Level Selection (Optional)</emphasis>
-    </para>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch:
-          <ulink url="&patch-root;/glib-skip_warnings-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend='packaging'/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend='docutils'/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend='cairo'/> (for some GObject Introspection tests),
-      <xref linkend="dbus"/> (for some tests),
-      <xref linkend="fuse3"/> and
-      <ulink url="https://bindfs.org/">bindfs</ulink>
-        (both needed for one test),
-      <xref linkend="gdb"/> (for bindings),
-      <xref linkend='gjs'/> (for some GObject Introspection tests),
-      <xref linkend='gtk-doc'/> (for GObject Introspection documentation),
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="gi-docgen"/> (to build API documentation),
-      <xref linkend="glib-networking"/> (for some tests, but this is a circular
-      dependency),
-      <xref linkend="Mako"/> and <xref linkend="markdown"/>
-      (both for <command>g-ir-doc-tool</command>), and
-      <!--<xref linkend="sysprof"/>-->
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-    <bridgehead renderas="sect4">Additional Runtime Dependencies</bridgehead>
-    <para role="recommended">
-      Quoted directly from the <filename>INSTALL</filename> file:
-      <quote>Some of the mimetype-related functionality in GIO requires the
-      <command>update-mime-database</command> and
-      <command>update-desktop-database</command> utilities</quote>,
-      which are part of
-      <xref role="runtime" linkend="shared-mime-info"/> and
-      <xref role="runtime" linkend="desktop-file-utils"/>, respectively.
-      These two utilities are also needed for some tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLib</title>
-
-    <para>
-      If desired, apply the optional patch. In many cases, applications that
-      use this library, either  directly or indirectly via other libraries such
-      as <xref linkend="gtk3"/>, output numerous warnings when run from the
-      command line.  This patch enables the use of an environment variable,
-      <envar>GLIB_LOG_LEVEL</envar>, that suppresses unwanted messages. The
-      value of the variable is a digit that corresponds to:
-    </para>
-
-    <simplelist>
-      <member>1  Alert</member>
-      <member>2  Critical</member>
-      <member>3  Error</member>
-      <member>4  Warning</member>
-      <member>5  Notice</member>
-    </simplelist>
-
-    <para>
-      For instance <userinput>export GLIB_LOG_LEVEL=4</userinput> will skip
-      output of Warning and Notice messages (and Info/Debug messages if they
-      are turned on).  If <envar>GLIB_LOG_LEVEL</envar> is not defined, normal
-      message output will not be affected.
-    </para>
-
-<screen><userinput>patch -Np1 -i ../glib-skip_warnings-1.patch</userinput></screen>
-
-    <warning>
-      <para>
-        If a previous version of glib is installed, move the headers out of the
-        way so that later packages do not encounter conflicts:
-      </para>
-
-<screen role="root"><userinput remap="pre">if [ -e /usr/include/glib-2.0 ]; then
-    rm -rf /usr/include/glib-2.0.old &amp;&amp;
-    mv -vf /usr/include/glib-2.0{,.old}
-fi</userinput></screen>
-
-    </warning>
-
-    <para>
-      Install <application>GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..                 \
-      --prefix=/usr            \
-      --buildtype=release      \
-      -Dintrospection=disabled \
-      -Dman-pages=enabled      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The <application>GLib</application> test suite requires
-      <application>desktop-file-utils</application> for some tests. However,
-      <application>desktop-file-utils</application> requires
-      <application>GLib</application> in order to compile; therefore, you must
-      first install <application>GLib</application> and then run the test
-      suite.
-    </para>
-
-    <para>
-      As the <systemitem class="username">root</systemitem> user,
-      install this package for the first time to allow building
-      GObject Introspection:
-    </para>
-
-    <screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      Build GObject Introspection:
-    </para>
-
-    <screen><userinput>tar xf ../../gobject-introspection-&gobject-introspection-version;.tar.xz &amp;&amp;
-
-meson setup gobject-introspection-&gobject-introspection-version; gi-build \
-            --prefix=/usr --buildtype=release     &amp;&amp;
-ninja -C gi-build</userinput></screen>
-
-    <para>
-      To test the results of GObject Introspection, issue:
-      <command>ninja -C gi-build test</command>.
-    </para>
-
-    <para>
-      As the &root; user, install GObject Introspection for generating
-      the introspection data of GLib libraries (required by various packages
-      using Glib, especially some GNOME packages):
-    </para>
-
-    <screen role='root'><userinput>ninja -C gi-build install</userinput></screen>
-
-    <para>
-      Now generate the introspection data:
-    </para>
-
-    <screen><userinput>meson configure -Dintrospection=enabled &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-    <screen remap='doc'><userinput>sed 's/glib-2.0/glib-&glib2-version;/'        \
-    -i ../docs/reference/meson.build &amp;&amp;
-meson configure -Ddocumentation=true &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      As the &root; user, install this package again for the introspection
-      data (and optionally, the documentation):
-    </para>
-
-    <screen role='root'><userinput>ninja install</userinput></screen>
-
-    <para>
-      You should now install <xref linkend="desktop-file-utils"/> and
-      <xref linkend="shared-mime-info"/> and proceed to
-      run the test suite.
-    </para>
-
-    <warning>
-      <para>
-        Do not run the test suite as &root; or some tests will fail
-        unexpectedly and leave some non-FHS-compliant directories in the
-        <filename class='directory'>/usr</filename> hierarchy.
-      </para>
-    </warning>
-
-    <para>
-      To test the results, after having installed the packages, issue:
-      <command>LC_ALL=C ninja test</command> as a non-&root; user.
-    </para>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dman-pages=enabled</parameter>: This switch causes the
-      build to create and install the package man pages.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <bridgehead renderas="sect3">GLib Contents</bridgehead>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gapplication,           gdbus, gdbus-codegen,
-          gi-compile-repository,  gi-decompile-typelib, gi-inspect-typelib
-          gio,                    gio-querymodules,
-          glib-compile-resources, glib-compile-schemas,
-          glib-genmarshal,        glib-gettextize,
-          glib-mkenums,           gobject-query,
-          gresource,              gsettings,
-          gtester, and            gtester-report
-        </seg>
-        <seg>
-          libgio-2.0.so,
-          libgirepository-2.0.so,
-          libglib-2.0.so,
-          libgmodule-2.0.so,
-          libgobject-2.0.so, and
-          libgthread-2.0.so
-        </seg>
-        <seg>
-          /usr/include/gio-unix-2.0,
-          /usr/include/glib-2.0,
-          /usr/lib/gio,
-          /usr/lib/glib-2.0,
-          /usr/share/glib-2.0, and
-          /usr/share/doc/glib-&glib2-version; (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">GObject Introspection Contents</bridgehead>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <!-- g-ir-doc-tool is installed if Mako and Markdown are present -->
-      <seglistitem>
-        <seg>
-          g-ir-annotation-tool, g-ir-compiler, g-ir-doc-tool (optional),
-          g-ir-generate, g-ir-inspect, and g-ir-scanner
-        </seg>
-        <seg>
-          libgirepository-1.0.so and
-          _giscanner.&python3-lib-suffix;.so
-        </seg>
-        <seg>
-          /usr/include/gobject-introspection-1.0,
-          /usr/lib/girepository-1.0,
-          /usr/lib/gobject-introspection,
-          /usr/share/gir-1.0, and
-          /usr/share/gobject-introspection-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gapplication">
-        <term><command>gapplication</command></term>
-        <listitem>
-          <para>
-            can be used to start applications and to send
-            messages to already-running instances of other applications
-          </para>
-          <indexterm zone="glib2 gapplication">
-            <primary sortas="b-gapplication">application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbus">
-        <term><command>gdbus</command></term>
-        <listitem>
-          <para>
-            is a simple tool used for working with
-            <application>D-Bus</application> objects
-          </para>
-          <indexterm zone="glib2 gdbus">
-            <primary sortas="b-gdbus">gdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdbus-codegen">
-        <term><command>gdbus-codegen</command></term>
-        <listitem>
-          <para>
-            is used to generate code and/or documentation for one or
-            more <application>D-Bus</application> interfaces
-          </para>
-          <indexterm zone="glib2 gdbus-codegen">
-            <primary sortas="b-gdbus-codegen">gdbus-codegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-compile-repository">
-        <term><command>gi-compile-repository</command></term>
-        <listitem>
-          <para>
-            converts one or more GIR files into one or more typelib files
-          </para>
-          <indexterm zone="glib2 gi-compile-repository">
-            <primary sortas="b-gi-compile-repository">gi-compile-repository</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-decompile-typelib">
-        <term><command>gi-decompile-typelib</command></term>
-        <listitem>
-          <para>
-            is a GIR decompiler that uses the repository API
-          </para>
-          <indexterm zone="glib2 gi-decompile-typelib">
-            <primary sortas="b-gi-decompile-typelib">gi-decompile-typelib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gi-inspect-typelib">
-        <term><command>gi-inspect-typelib</command></term>
-        <listitem>
-          <para>
-            is a utility that gives information about a GI typelib
-          </para>
-          <indexterm zone="glib2 gi-inspect-typelib">
-            <primary sortas="b-gi-inspect-typelib">gi-inspect-typelib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gio">
-        <term><command>gio</command></term>
-        <listitem>
-          <para>
-            is a utility that makes many <application>GIO</application>
-            features available from the command line
-          </para>
-          <indexterm zone="glib2 gio">
-            <primary sortas="b-gio">gio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gio-querymodules">
-        <term><command>gio-querymodules</command></term>
-        <listitem>
-          <para>
-            is used to create a <filename>giomodule.cache</filename> file in
-            the listed directories. This file lists the implemented extension
-            points for each module that has been found
-          </para>
-          <indexterm zone="glib2 gio-querymodules">
-            <primary sortas="b-gio-querymodules">gio-querymodules</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-compile-resources">
-        <term><command>glib-compile-resources</command></term>
-        <listitem>
-          <para>
-            is used to read the resource description from a file and
-            the files that it references to create a binary resource
-            bundle that is suitable for use with the GResource API
-          </para>
-          <indexterm zone="glib2 glib-compile-resources">
-            <primary sortas="b-glib-compile-resources">glib-compile-resources</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-compile-schemas">
-        <term><command>glib-compile-schemas</command></term>
-        <listitem>
-          <para>
-            is used to compile all the GSettings XML schema files
-            in a directory into a binary file with the name
-            <filename>gschemas.compiled</filename> that can be used by GSettings
-          </para>
-          <indexterm zone="glib2 glib-compile-schemas">
-            <primary sortas="b-glib-compile-resources">glib-compile-schemas</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-genmarshal">
-        <term><command>glib-genmarshal</command></term>
-        <listitem>
-          <para>
-            is a C code marshaller generation utility for GLib closures
-          </para>
-          <indexterm zone="glib2 glib-genmarshal">
-            <primary sortas="b-glib-genmarshal">glib-genmarshal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-gettextize">
-        <term><command>glib-gettextize</command></term>
-        <listitem>
-          <para>
-            is a variant of the <application>gettext</application>
-            internationalization utility
-          </para>
-          <indexterm zone="glib2 glib-gettextize">
-            <primary sortas="b-glib-gettextize">glib-gettextize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="glib-mkenums">
-        <term><command>glib-mkenums</command></term>
-        <listitem>
-          <para>
-            is a C language enum description generation utility
-          </para>
-          <indexterm zone="glib2 glib-mkenums">
-            <primary sortas="b-glib-mkenums">glib-mkenums</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gobject-query">
-        <term><command>gobject-query</command></term>
-        <listitem>
-          <para>
-            is a small utility that draws a tree of types
-          </para>
-          <indexterm zone="glib2 gobject-query">
-            <primary sortas="b-gobject-query">gobject-query</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gresource">
-        <term><command>gresource</command></term>
-        <listitem>
-          <para>
-            offers a simple command line interface to GResource
-          </para>
-          <indexterm zone="glib2 gresource">
-            <primary sortas="b-gresource">gresource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsettings">
-        <term><command>gsettings</command></term>
-        <listitem>
-          <para>
-            offers a simple command line interface to GSettings
-          </para>
-          <indexterm zone="glib2 gsettings">
-            <primary sortas="b-gsettings">gsettings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester">
-        <term><command>gtester</command></term>
-        <listitem>
-          <para>
-            is a test running utility
-          </para>
-          <indexterm zone="glib2 gtester">
-            <primary sortas="b-gtester">gtester</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtester-report">
-        <term><command>gtester-report</command></term>
-        <listitem>
-          <para>
-            is a test report formatting utility
-          </para>
-          <indexterm zone="glib2 gtester-report">
-            <primary sortas="b-gtester-report">gtester-report</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgio">
-        <term><filename class='libraryfile'>libgio-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a library providing useful classes for general purpose I/O,
-            networking, IPC, settings, and other high level application
-            functionality
-          </para>
-          <indexterm zone="glib2 libgio">
-            <primary sortas="c-libgio">libgio-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgirepository">
-        <term><filename class='libraryfile'>libgirepository-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a library providing access to typelibs and introspection data
-            which describes C APIs
-          </para>
-          <indexterm zone="glib2 libgirepository">
-            <primary sortas="c-libgirepository2">libgirepository-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglib">
-        <term><filename class='libraryfile'>libglib-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a general-purpose, portable utility library, which provides
-            many useful data types, macros, type conversions, string
-            utilities, file utilities, a mainloop abstraction, and so on
-          </para>
-          <indexterm zone="glib2 libglib">
-            <primary sortas="c-libglib">libglib-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgmodule">
-        <term><filename class='libraryfile'>libgmodule-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides portable API for dynamically loading modules
-          </para>
-          <indexterm zone="glib2 libgmodule">
-            <primary sortas="c-libgmodule">libgmodule-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgobject">
-        <term><filename class='libraryfile'>libgobject-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides the GLib base type system and object class
-          </para>
-          <indexterm zone="glib2 libgobject">
-            <primary sortas="c-libgobject">libgobject-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgthread">
-        <term><filename class='libraryfile'>libgthread-2.0.so</filename></term>
-        <listitem>
-          <para>
-            is a skeleton library for backwards compatibility; it used to
-            be the GLib thread library but the functionalities has been
-            merged info <systemitem class='library'>libglib-2.0</systemitem>
-          </para>
-          <indexterm zone="glib2 libgthread">
-            <primary sortas="c-libgthread">libgthread-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-annotation-tool">
-        <term><command>g-ir-annotation-tool</command></term>
-        <listitem>
-          <para>
-            creates or extracts annotation data from GI typelibs
-          </para>
-          <indexterm zone="glib2 g-ir-annotation-tool">
-            <primary sortas="b-g-ir-annotation-tool">g-ir-annotation-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-compiler">
-        <term><command>g-ir-compiler</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-compile-repository</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-compiler">
-            <primary sortas="b-g-ir-compiler">g-ir-compiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="g-ir-doc-tool">
-        <term><command>g-ir-doc-tool</command></term>
-        <listitem>
-          <para>
-            generates Mallard files that can be viewed with
-            <command>yelp</command> or rendered to HTML with
-            <command>yelp-build</command> from
-            <ulink url="&gnome-download-http;/yelp-tools">yelp-tools</ulink>
-          </para>
-          <indexterm zone="glib2 g-ir-doc-tool">
-            <primary sortas="b-g-ir-doc-tool">g-ir-doc-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-inspect">
-        <term><command>g-ir-inspect</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-inspect-typelib</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-inspect">
-            <primary sortas="b-g-ir-inspect">g-ir-inspect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-generate">
-        <term><command>g-ir-generate</command></term>
-        <listitem>
-          <para>
-            is a counterpart of <command>gi-decompile-typelib</command>
-            for the old
-            <systemitem class='library'>libgirepository-1.0</systemitem>
-            API
-          </para>
-          <indexterm zone="glib2 g-ir-generate">
-            <primary sortas="b-g-ir-generate">g-ir-generate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g-ir-scanner">
-        <term><command>g-ir-scanner</command></term>
-        <listitem>
-          <para>
-            is a tool which generates GIR XML files by parsing headers and
-            introspecting GObject based libraries
-          </para>
-          <indexterm zone="glib2 g-ir-scanner">
-            <primary sortas="b-g-ir-scanner">g-ir-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgirepository-1.0">
-        <term><filename class='libraryfile'>libgirepository-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is a counterpart of
-            <systemitem class='library'>libgirepository-2.0</systemitem>
-            with the old 1.0 API
-          </para>
-          <indexterm zone="glib2 libgirepository-1.0">
-            <primary sortas="c-libgirepository1">libgirepository-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/glibmm.xml
===================================================================
--- general/genlib/glibmm.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glibmm-download-http "&gnome-download-http;/glibmm/2.66/glibmm-&glibmm-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  " ">
-  <!ENTITY glibmm-md5sum        "c6edf4cc986adec2a6d21e7423bad7d1">
-  <!ENTITY glibmm-size          "8.4 MB">
-  <!ENTITY glibmm-buildsize     "83 MB (with tests)">
-  <!ENTITY glibmm-time          "0.5 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="glibmm" xreflabel="GLibmm-&glibmm-version;">
-  <?dbhtml filename="glibmm.html"?>
-
-
-  <title>GLibmm-&glibmm-version;</title>
-
-  <indexterm zone="glibmm">
-    <primary sortas="a-GLibmm">GLibmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLibmm</title>
-
-    <para>
-      The <application>GLibmm</application> package is a set of C++ bindings
-      for <application>GLib</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glibmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glibmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glibmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glibmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glibmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glibmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLibmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLibmm</title>
-
-    <para>
-      Install <application>GLibmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja 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>
-          libgiomm-2.4.so, libglibmm-2.4.so and
-          libglibmm_generate_extra_defs-2.4.so
-        </seg>
-        <seg>
-          /usr/lib/g{io,lib}mm-2.4 and
-          /usr/include/g{io,lib}mm-2.4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgiomm-2">
-        <term><filename class="libraryfile">libgiomm-2.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the GIO API classes
-          </para>
-          <indexterm zone="glibmm libgiomm-2">
-            <primary sortas="c-libgiomm-2">libgiomm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglibmm-2">
-        <term><filename class="libraryfile">libglibmm-2.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GLib</application> API classes
-          </para>
-          <indexterm zone="glibmm libglibmm-2">
-            <primary sortas="c-libglibmm-2">libglibmm-2.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/glibmm2.xml
===================================================================
--- general/genlib/glibmm2.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 glibmm-download-http "&gnome-download-http;/glibmm/2.80/glibmm-&glibmm2-version;.tar.xz">
-  <!ENTITY glibmm-download-ftp  " ">
-  <!ENTITY glibmm-md5sum        "7e58344303cec7cd5f1e812f4c70cb43">
-  <!ENTITY glibmm-size          "9.1 MB">
-  <!ENTITY glibmm-buildsize     "97 MB (with tests)">
-  <!ENTITY glibmm-time          "0.6 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="glibmm2" xreflabel="GLibmm-&glibmm2-version;">
-  <?dbhtml filename="glibmm2.html"?>
-
-
-  <title>GLibmm-&glibmm2-version;</title>
-
-  <indexterm zone="glibmm2">
-    <primary sortas="a-GLibmm2">GLibmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLibmm</title>
-
-    <para>
-      The <application>GLibmm</application> package is a set of C++ bindings
-      for <application>GLib</application>. This version is part of a new API
-      for supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glibmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glibmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glibmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glibmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glibmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glibmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLibmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libsigc3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="glib-networking"/> (for tests),
-      <xref linkend="gnutls"/> (for tests),
-      <xref linkend="libxslt"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLibmm</title>
-
-    <para>
-      Install <application>GLibmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja 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>
-          libgiomm-2.68.so,
-          libglibmm-2.68.so, and
-          libglibmm_generate_extra_defs-2.68.so
-        </seg>
-        <seg>
-          /usr/lib/g{io,lib}mm-2.68 and
-          /usr/include/g{io,lib}mm-2.68
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgiomm-2.68">
-        <term><filename class="libraryfile">libgiomm-2.68.so</filename></term>
-        <listitem>
-          <para>
-            contains the GIO API classes
-          </para>
-          <indexterm zone="glibmm2 libgiomm-2.68">
-            <primary sortas="c-libgiomm-2.68">libgiomm-2.68.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglibmm-2.68">
-        <term><filename class="libraryfile">libglibmm-2.68.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GLib</application> API classes
-          </para>
-          <indexterm zone="glibmm2 libglibmm-2.68">
-            <primary sortas="c-libglibmm-2.68">libglibmm-2.68.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/gmime3.xml
===================================================================
--- general/genlib/gmime3.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,173 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gmime3-download-http "&gnome-download-http;/gmime/3.2/gmime-&gmime3-version;.tar.xz">
-  <!ENTITY gmime3-download-ftp  " ">
-  <!ENTITY gmime3-md5sum        "7ecd9aa75e0cd2e8668206b1d53df874">
-  <!ENTITY gmime3-size          "2.1 MB">
-  <!ENTITY gmime3-buildsize     "25 MB (with tests)">
-  <!ENTITY gmime3-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="gmime3" xreflabel="GMime-&gmime3-version;">
-  <?dbhtml filename="gmime3.html"?>
-
-
-  <title>GMime-&gmime3-version;</title>
-
-  <indexterm zone="gmime3">
-    <primary sortas="a-GMime-3">GMime 3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GMime</title>
-
-    <para>
-      The <application>GMime</application> package contains a set of
-      utilities for parsing and creating messages using the Multipurpose
-      Internet Mail Extension (MIME) as defined by the applicable RFCs. See the
-      <ulink url="https://spruce.sourceforge.net/gmime/">GMime web site</ulink>
-      for the RFCs resourced. This is useful as it provides an API which adheres
-      to the MIME specification as closely as possible while also providing
-      programmers with an extremely easy to use interface to the API functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gmime3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gmime3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gmime3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gmime3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gmime3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gmime3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GMime Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="libgpg-error"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="gpgme"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="vala"/>, and
-      <ulink url="https://download.mono-project.com/sources/gtk-sharp/">Gtk#</ulink> (requires
-      <ulink url="https://www.mono-project.com/Main_Page">Mono</ulink>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GMime</title>
-
-    <para>
-      Install <application>GMime</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>
-          libgmime-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gmime-3.0 and
-          /usr/share/gtk-doc/html/gmime-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgmime-3">
-        <term><filename class="libraryfile">libgmime-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used by programs that need to comply to
-            the MIME standards
-          </para>
-          <indexterm zone="gmime3 libgmime-3">
-            <primary sortas="c-libgmime-3">libgmime-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/gsl.xml
===================================================================
--- general/genlib/gsl.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,218 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gsl-download-http "&gnu-http;/gsl/gsl-&gsl-version;.tar.gz">
-  <!ENTITY gsl-download-ftp  " ">
-  <!ENTITY gsl-md5sum        "36aee97e67f64dbdab7afae197e3483b">
-  <!ENTITY gsl-size          "7.2 MB">
-  <!ENTITY gsl-buildsize     "213 MB (with tests, without docs)">
-  <!ENTITY gsl-time          "1.2 SBU (Using parallelism=4; with tests, without docs)">
-]>
-
-<sect1 id="gsl" xreflabel="Gsl-&gsl-version;">
-  <?dbhtml filename="gsl.html"?>
-
-
-  <title>Gsl-&gsl-version;</title>
-
-  <indexterm zone="gsl">
-    <primary sortas="a-gsl">Gsl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gsl</title>
-
-    <para>
-      The GNU Scientific Library (GSL) is a numerical library for C and C++
-      programmers. It provides a wide range of mathematical routines such as
-      random number generators, special functions and least-squares fitting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gsl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gsl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gsl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gsl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gsl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gsl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gsl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx_rtd_theme"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gsl</title>
-
-    <para>
-      Install <application>Gsl</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="sphinx_rtd_theme"/>
-      installed, build the documentation with:
-    </para>
-
-<screen remap="doc"><userinput>make html</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>
-
-    <para>
-      If you built the documentation, install it (as <systemitem
-      class="username">root</systemitem>) with:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>mkdir                   /usr/share/doc/gsl-&gsl-version; &amp;&amp;
-cp -R doc/_build/html/* /usr/share/doc/gsl-&gsl-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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          gsl-config, gsl-histogram, and gsl-randist
-        </seg>
-        <seg>
-          libgslcblas.so and libgsl.so
-        </seg>
-        <seg>
-          /usr/include/gsl and /usr/share/doc/gsl-&gsl-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsl-config">
-        <term><command>gsl-config</command></term>
-        <listitem>
-          <para>
-            is a shell script to get the version number and compiler flags of
-            the installed <application>Gsl</application> library
-          </para>
-          <indexterm zone="gsl gsl-config">
-            <primary sortas="b-gsl-config">gsl-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsl-histogram">
-        <term><command>gsl-histogram</command></term>
-        <listitem>
-          <para>
-            is a demonstration program for the GNU Scientific Library that
-            computes a histogram from data taken from stdin
-          </para>
-          <indexterm zone="gsl gsl-histogram">
-            <primary sortas="b-gsl-histogram">gsl-histogram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsl-randist">
-        <term><command>gsl-randist</command></term>
-        <listitem>
-          <para>
-            is a demonstration program for the GNU Scientific Library that
-            generates random samples from various distributions
-          </para>
-          <indexterm zone="gsl gsl-randist">
-            <primary sortas="b-gsl-randist">gsl-randist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgslcblas">
-        <term><filename class="libraryfile">libgslcblas.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement a C interface to Basic Linear
-            Algebra Subprograms
-          </para>
-          <indexterm zone="gsl libgslcblas">
-            <primary sortas="c-libgslcblas">libgslcblas.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsl.so">
-        <term><filename class="libraryfile">libgsl.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a collection of numerical routines
-            for scientific computing
-          </para>
-          <indexterm zone="gsl libgsl.so">
-            <primary sortas="c-libgsl.so">libgsl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/gspell.xml
===================================================================
--- general/genlib/gspell.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,168 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 gspell-download-http "&gnome-download-http;/gspell/&gspell-minor;/gspell-&gspell-version;.tar.xz">
-  <!ENTITY gspell-download-ftp  " ">
-  <!ENTITY gspell-md5sum        "f1e5f02695aee20ba543352889c28ff5">
-  <!ENTITY gspell-size          "436 KB">
-  <!ENTITY gspell-buildsize     "11 MB (with tests)">
-  <!ENTITY gspell-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="gspell" xreflabel="gspell-&gspell-version;">
-  <?dbhtml filename="gspell.html"?>
-
-
-  <title>gspell-&gspell-version;</title>
-
-  <indexterm zone="gspell">
-    <primary sortas="a-gspell">gspell</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to gspell</title>
-
-    <para>
-      The <application>gspell</application> package provides a flexible API to
-      add spell checking to a GTK+ application.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gspell-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gspell-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gspell-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gspell-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gspell-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gspell-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">gspell Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="enchant"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &gobject-introspection;,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="vala"/>, and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of gspell</title>
-
-    <para>
-      Install <application>gspell</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.  The tests
-      must be run in an X session. One test, test-checker, is known to fail if
-      the external package
-      <ulink url="https://hunspell.github.io/">Hunspell</ulink> is not
-      installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/rm-la-file-referring-icu.xml"/>
-
-<screen role="root"><userinput>rm -v /usr/lib/libgspell-1.la</userinput></screen>
- </sect2>
-
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>gspell-app1</seg>
-        <seg>libgspell-1.so</seg>
-        <seg>/usr/include/gspell-1 and
-             /usr/share/gtk-doc/html/gspell-1.0</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gspell-app1">
-        <term><command>gspell-app1</command></term>
-        <listitem>
-          <para>
-            checks the spelling of a text entered in a window
-          </para>
-          <indexterm zone="gspell gspell-app1">
-            <primary sortas="b-gspell-app1">gspell-app1</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgspell">
-        <term><filename class="libraryfile">libgspell-1.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>gspell</application> API library
-          </para>
-          <indexterm zone="gspell libgspell">
-            <primary sortas="c-libgspell">libgspell-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/highway.xml
===================================================================
--- general/genlib/highway.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,190 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 highway-download-http "https://github.com/google/highway/archive/&highway-version;/highway-&highway-version;.tar.gz">
-  <!ENTITY highway-md5sum        "6a5d433b66626afbd3fcc5884d2f270a">
-  <!ENTITY highway-size          "2.1 MB">
-  <!ENTITY highway-buildsize     "25 MB">
-  <!ENTITY highway-time          "0.6 SBU (with parallelism=4)">
-]>
-
-<sect1 id="highway" xreflabel="highway-&highway-version;">
-  <?dbhtml filename="highway.html"?>
-
-   <title>highway-&highway-version;</title>
-
-  <indexterm zone="highway">
-    <primary sortas="a-highway">highway</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to highway</title>
-
-    <para>
-      The <application>highway</application> package contains a C++ library
-      that provides portable SIMD/vector intrinsics.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&highway-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &highway-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &highway-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &highway-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &highway-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">highway Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of highway</title>
-
-    <para>
-      Install <application>highway</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr \
-      -D CMAKE_BUILD_TYPE=Release  \
-      -D BUILD_TESTING=OFF         \
-      -D BUILD_SHARED_LIBS=ON      \
-      -G Ninja ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not in BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DBUILD_TESTING=OFF</parameter>: This parameter disables the
-      test suite from being built because
-      <ulink url="https://github.com/google/googletest">gtest</ulink> is not
-      part of BLFS. Without this parameter, CMake will download this package
-      during the configuration process. If you wish to run the tests, install
-      <ulink url="https://github.com/google/googletest">gtest</ulink> and then
-      remove this parameter.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This parameter enables
-      building shared versions of the libraries instead of static versions.
-    </para>
-
-  </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>
-          libhwy.so,
-          libhwy_contrib.so, and
-          libhwy_test.so
-        </seg>
-        <seg>
-          /usr/include/hwy and
-          /usr/lib/cmake/hwy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libhwy">
-        <term><filename class="libraryfile">libhwy.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide portable SIMD/vector intrinsics
-          </para>
-          <indexterm zone="highway libhwy">
-            <primary sortas="c-libhwy">libhwy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhwy_contrib">
-        <term><filename class="libraryfile">libhwy_contrib.so</filename></term>
-        <listitem>
-          <para>
-            contains several additions to Highway, including a series of dot
-            product, image, math, and sort routines
-          </para>
-          <indexterm zone="highway libhwy_contrib">
-            <primary sortas="c-libhwy_contrib">libhwy_contrib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libhwy_test">
-        <term><filename class="libraryfile">libhwy_test.so</filename></term>
-        <listitem>
-          <para>
-            contains test helpers for Highway
-          </para>
-          <indexterm zone="highway libhwy_test">
-            <primary sortas="c-libhwy_test">libhwy_test.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/icu.xml
===================================================================
--- general/genlib/icu.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,520 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 icu-download-http
-           "https://github.com/unicode-org/icu/releases/download/release-&icu-major;-&icu-minor;/icu4c-&icu-major;_&icu-minor;-src.tgz">
-  <!ENTITY icu-download-ftp  " ">
-  <!ENTITY icu-md5sum        "a83c1499e508f73ddbc60002f84ea42a">
-  <!ENTITY icu-size          "25 MB">
-  <!ENTITY icu-buildsize     "341 MB (add 45 MB for tests)">
-  <!ENTITY icu-time          "0.7 SBU (Using parallelism=4; add 2.0 SBU for tests)">
-]>
-
-<sect1 id="icu" xreflabel="ICU-&icu-version;">
-  <?dbhtml filename="icu.html"?>
-
-
-  <title>icu-&icu-version;</title>
-
-  <indexterm zone="icu">
-    <primary sortas="a-icu">icu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to ICU</title>
-
-    <para>
-      The <application>International Components for Unicode</application> (ICU)
-      package is a mature, widely used set of C/C++ libraries providing Unicode
-      and Globalization support for software applications.
-      <application>ICU</application> is widely portable and gives applications
-      the same results on all platforms.
-    </para>
-
-    <warning>
-      <para>
-        Upgrading this package to a new major version (for example, from
-        72.1 to &icu-version;) will require rebuilding of many other
-        packages. If some packages that use the libraries built by
-        icu4c-&icu-major; are rebuilt, they will use the new libraries while
-        current packages will use the previous libraries.  If the Linux
-        application loader
-        (<filename class='libraryfile'>/usr/lib/ld-linux-x86-64.so.2</filename>)
-        determines that both the old and new libraries are needed, and a
-        symbol (name of data or function) exists in both versions of the
-        library, all references to the symbol will be resolved to the
-        version appearing earlier in the breadth-first sequence of the
-        dependency graph.  This may result in the application failing if
-        the definition of the data or the behavior of the function referred
-        by the symbol differs in two versions.  To avoid the issue, users
-        will need to rebuild every package linked to an ICU library as soon
-        as possible once ICU is updated to a new major version.
-      </para>
-
-      <para>
-        To determine what external libraries are needed (directly or indirectly)
-        by an application or a library, run:
-      </para>
-
-<screen><userinput>ldd &lt;application or library&gt; </userinput></screen>
-
-      <para>
-        or to see only the directly needed libraries:
-      </para>
-
-<screen><userinput>readelf -d  &lt;application or library&gt; | grep NEEDED</userinput></screen>
-
-    </warning>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&icu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&icu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &icu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &icu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &icu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &icu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/icu4c-&icu-version;-fix_enumeration-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">ICU Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="llvm"/> (with Clang), and
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ICU</title>
-
-    <note>
-      <para>
-        This package expands to the directory
-        <filename class='directory'>icu</filename>.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        If <command>clang++</command> is available, it will be used in the
-        mistaken belief that <command>g++</command> might not support C++11,
-        even though <command>configure</command> has tested for that.  If
-        using <command>g++</command> there will be an unnecessary warning at
-        the end of <command>configure</command>.  Building with
-        <command>g++</command> also takes longer than the estimated SBU shown.
-      </para>
-    </note>
-<!--
-    <para>
-      First, fix a regression in version 58.1:
-    </para>
-
-<screen><userinput>patch -p1 -i ../icu4c-&icu-version;-fix_enumeration-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>ICU</application> by running the following commands:
-    </para>
-
-<!-- Review comments at:
-https://chromium.googlesource.com/chromium/src/+/e58fa0ba66272c5f28828b15d06c7e42a9882b3b
-To see if the following prebuild command is appropriate for BLFS:
-sed '/fdef U_CHARSET_I/i#define U_CHARSET_IS_UTF8 1' -i common/unicode/platform.h
--->
-<screen><userinput>cd source                                    &amp;&amp;
-
-./configure --prefix=/usr                    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          derb, escapesrc, genbrk, genccode, gencfu, gencmn, gencnval,
-          gendict, gennorm2,
-          genrb, gensprep, icu-config, icuexportdata, icuinfo, icupkg,
-          makeconv, pkgdata, and uconv
-        </seg>
-        <seg>
-          libicudata.so, libicui18n.so, libicuio.so,
-          libicutest.so, libicutu.so, and libicuuc.so
-        </seg>
-        <seg>
-          /usr/include/unicode,
-          /usr/lib/icu, and
-          /usr/share/icu
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="derb">
-        <term><command>derb</command></term>
-        <listitem>
-          <para>
-            disassembles a resource bundle
-          </para>
-          <indexterm zone="icu derb">
-            <primary sortas="b-derb">derb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="escapesrc">
-        <term><command>escapesrc</command></term>
-        <listitem>
-          <para>
-            converts <quote>\u</quote> escaped characters into unicode
-            characters
-          </para>
-          <indexterm zone="icu escapesrc">
-            <primary sortas="b-escapesrc">escapesrc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genbrk">
-        <term><command>genbrk</command></term>
-        <listitem>
-          <para>
-            compiles ICU break iteration rules source files into binary data
-            files
-          </para>
-          <indexterm zone="icu genbrk">
-            <primary sortas="b-genbrk">genbrk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genccode">
-        <term><command>genccode</command></term>
-        <listitem>
-          <para>
-            generates C or platform specific assembly code from an ICU data
-            file
-          </para>
-          <indexterm zone="icu genccode">
-            <primary sortas="b-genccode">genccode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencfu">
-        <term><command>gencfu</command></term>
-        <listitem>
-          <para>
-            reads in Unicode confusable character definitions and writes out the
-            binary data
-          </para>
-          <indexterm zone="icu gencfu">
-            <primary sortas="b-gencfu">gencfu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencmn">
-        <term><command>gencmn</command></term>
-        <listitem>
-          <para>
-            generates an ICU memory-mappable data file
-          </para>
-          <indexterm zone="icu gencmn">
-            <primary sortas="b-gencmn">gencmn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencnval">
-        <term><command>gencnval</command></term>
-        <listitem>
-          <para>
-            compiles the converter's aliases file
-          </para>
-          <indexterm zone="icu gencnval">
-            <primary sortas="b-gencnval">gencnval</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gendict">
-        <term><command>gendict</command></term>
-        <listitem>
-          <para>
-            compiles word lists into ICU string trie dictionaries
-          </para>
-          <indexterm zone="icu gendict">
-            <primary sortas="b-gendict">gendict</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gennorm2">
-        <term><command>gennorm2</command></term>
-        <listitem>
-          <para>
-            builds binary data files with Unicode normalization data
-          </para>
-          <indexterm zone="icu gennorm2">
-            <primary sortas="b-gennorm2">gennorm2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="genrb">
-        <term><command>genrb</command></term>
-        <listitem>
-          <para>
-            compiles a resource bundle
-          </para>
-          <indexterm zone="icu genrb">
-            <primary sortas="b-genrb">genrb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gensprep">
-        <term><command>gensprep</command></term>
-        <listitem>
-          <para>
-            compiles StringPrep data from filtered RFC 3454 files
-          </para>
-          <indexterm zone="icu gensprep">
-            <primary sortas="b-gensprep">gensprep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icu-config">
-        <term><command>icu-config</command></term>
-        <listitem>
-          <para>
-            outputs ICU build options
-          </para>
-          <indexterm zone="icu icu-config">
-            <primary sortas="b-icu-config">icu-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icuinfo">
-        <term><command>icuinfo</command></term>
-        <listitem>
-          <para>
-            outputs configuration information about the current ICU
-          </para>
-          <indexterm zone="icu icuinfo">
-            <primary sortas="b-icuinfo">icuinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icupkg">
-        <term><command>icupkg</command></term>
-        <listitem>
-          <para>
-            extracts or modifies an ICU .dat archive
-          </para>
-          <indexterm zone="icu icupkg">
-            <primary sortas="b-icupkg">icupkg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makeconv">
-        <term><command>makeconv</command></term>
-        <listitem>
-          <para>
-            compiles a converter table
-          </para>
-          <indexterm zone="icu makeconv">
-            <primary sortas="b-makeconv">makeconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkgdata">
-        <term><command>pkgdata</command></term>
-        <listitem>
-          <para>
-            packages data for use by ICU
-          </para>
-          <indexterm zone="icu pkgdata">
-            <primary sortas="b-pkgdata">pkgdata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uconv">
-        <term><command>uconv</command></term>
-        <listitem>
-          <para>
-            converts data from one encoding to another
-          </para>
-          <indexterm zone="icu uconv">
-            <primary sortas="b-uconv">uconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicudata">
-        <term><filename class="libraryfile">libicudata.so</filename></term>
-        <listitem>
-          <para>
-            is the data library
-          </para>
-          <indexterm zone="icu libicudata">
-            <primary sortas="c-libicudata">libicudata.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicui18n">
-        <term><filename class="libraryfile">libicui18n.so</filename></term>
-        <listitem>
-          <para>
-            is the internationalization (i18n) library
-          </para>
-          <indexterm zone="icu libicui18n">
-            <primary sortas="c-libicui18n">libicui18n.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicuio">
-        <term><filename class="libraryfile">libicuio.so</filename></term>
-        <listitem>
-          <para>
-            is the ICU I/O (unicode stdio) library
-          </para>
-          <indexterm zone="icu libicuio">
-            <primary sortas="c-libicuio">libicuio.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!--  <varlistentry id="libicule">
-        <term><filename class="libraryfile">libicule.so</filename></term>
-        <listitem>
-          <para>
-            is the layout engine.
-          </para>
-          <indexterm zone="icu libicule">
-            <primary sortas="c-libicule">libicule.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiculx">
-        <term><filename class="libraryfile">libiculx.so</filename></term>
-        <listitem>
-          <para>
-            is the layout extensions engine.
-          </para>
-          <indexterm zone="icu libiculx">
-            <primary sortas="c-libiculx">libiculx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>-->
-
-      <varlistentry id="libicutest">
-        <term><filename class="libraryfile">libicutest.so</filename></term>
-        <listitem>
-          <para>
-            is the test library
-          </para>
-          <indexterm zone="icu libicutest">
-            <primary sortas="c-libicutest">libicutest.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicutu">
-        <term><filename class="libraryfile">libicutu.so</filename></term>
-        <listitem>
-          <para>
-            is the tool utility library
-          </para>
-          <indexterm zone="icu libicutu">
-            <primary sortas="c-libicutu">libicutu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicuuc">
-        <term><filename class="libraryfile">libicuuc.so</filename></term>
-        <listitem>
-          <para>
-            is the common library
-          </para>
-          <indexterm zone="icu libicuuc">
-            <primary sortas="c-libicuuc">libicuuc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/inih.xml
===================================================================
--- general/genlib/inih.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 inih-download-http
-    "https://github.com/benhoyt/inih/archive/r&inih-version;/inih-r&inih-version;.tar.gz">
-  <!ENTITY inih-download-ftp  " ">
-  <!ENTITY inih-md5sum        "5c9725320ad2c79e0b1f76568bd0ff24">
-  <!ENTITY inih-size          "20 KB">
-  <!ENTITY inih-buildsize     "724 KB">
-  <!ENTITY inih-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="inih" xreflabel="inih-&inih-version;">
-  <?dbhtml filename="inih.html"?>
-
-
-  <title>inih-&inih-version;</title>
-
-  <indexterm zone="inih">
-    <primary sortas="a-inih">inih</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to inih</title>
-
-    <para>
-      This package is a simple .INI file parser written in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&inih-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&inih-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &inih-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &inih-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &inih-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &inih-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of inih</title>
-
-    <para>
-      Install <application>inih</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-<!-- Note.  There is a tests directoy.  If we do:
-  cd ../tests
-  sh unittest.sh
-The tests seem to be run, but there is no output or log.
--->
-    <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>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libinih.so, libINIReader.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libinih">
-        <term><filename class="libraryfile">libinih.so</filename></term>
-        <listitem>
-          <para>
-            is the inih main library
-          </para>
-          <indexterm zone="inih libinih">
-            <primary sortas="c-libinih">libinih.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libINIReader">
-        <term><filename class="libraryfile">libINIReader.so</filename></term>
-        <listitem>
-          <para>
-            is the inih parser library
-          </para>
-          <indexterm zone="inih libINIReader">
-            <primary sortas="c-libINIReader">libINIReader.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/intel-gmmlib.xml
===================================================================
--- general/genlib/intel-gmmlib.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 intel-gmmlib-download-http "https://github.com/intel/gmmlib/archive/intel-gmmlib-&intel-gmmlib-version;.tar.gz">
-  <!ENTITY intel-gmmlib-download-ftp  " ">
-  <!ENTITY intel-gmmlib-md5sum        "7d947d9fa06c101731ac4881857e056a">
-  <!ENTITY intel-gmmlib-size          "828 KB">
-  <!ENTITY intel-gmmlib-buildsize     "53 MB">
-  <!ENTITY intel-gmmlib-time          "0.5 SBU">
-]>
-
-<sect1 id="intel-gmmlib" xreflabel="Intel-gmmlib-&intel-gmmlib-version;">
-  <?dbhtml filename="intel-gmmlib.html"?>
-
-  <title>Intel-gmmlib-&intel-gmmlib-version;</title>
-
-  <indexterm zone="intel-gmmlib">
-    <primary sortas="a-intel-gmmlib">Intel-gmmlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Intel-gmmlib</title>
-
-    <para>
-      The <application>Intel-gmmlib</application> package contains the Intel
-      Graphics Memory Management Library, which provides device specific memory
-      and buffer management functions for the Intel Media Driver for VAAPI and
-      the Intel Graphics Computer Runtime for OpenCL (TM).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&intel-gmmlib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&intel-gmmlib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &intel-gmmlib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &intel-gmmlib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &intel-gmmlib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &intel-gmmlib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>
-        The tarball
-        <filename>intel-gmmlib-&intel-gmmlib-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">gmmlib-intel-gmmlib-&intel-gmmlib-version;</filename>.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Intel-gmmlib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Intel-gmmlib</title>
-
-    <para>
-      Install <application>Intel-gmmlib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr   \
-      -DBUILD_TYPE=Release          \
-      -G Ninja                      \
-      -Wno-dev ..                   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The test suite is normally run by <command>ninja</command> unless
-      -DRUN_TEST_SUITE=NO is passed to cmake.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja 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>
-          libigdgmm.so
-        </seg>
-        <seg>
-          /usr/include/igdgmm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libigdgmm">
-        <term><filename class="libraryfile">libigdgmm.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide Memory Management functions for
-            Intel Graphics Drivers
-          </para>
-          <indexterm zone="intel-gmmlib libigdgmm">
-            <primary sortas="c-libigdgmm">libigdgmm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/jansson.xml
===================================================================
--- general/genlib/jansson.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 jansson-download-http "https://github.com/akheron/jansson/releases/download/v&jansson-version;/jansson-&jansson-version;.tar.bz2">
-  <!ENTITY jansson-download-ftp  " ">
-  <!ENTITY jansson-md5sum        "3f90473d7d54ebd1cb6a2757396641df">
-  <!ENTITY jansson-size          "424 KB">
-  <!ENTITY jansson-buildsize     "5.6 MB (add 1.9 MB for tests)">
-  <!ENTITY jansson-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="jansson" xreflabel="jansson-&jansson-version;">
-  <?dbhtml filename="jansson.html"?>
-
-
-  <title>Jansson-&jansson-version;</title>
-
-  <indexterm zone="jansson">
-    <primary sortas="a-jansson">jansson</primary>
-  </indexterm>
-  <sect2 role="package">
-    <title>Introduction to Jansson</title>
-
-    <para>
-      The <application>Jansson</application> package contains a library used to
-      encode, decode, and manipulate JSON data.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&jansson-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&jansson-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &jansson-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &jansson-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &jansson-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &jansson-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <!-- No dependencies -->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Jansson</title>
-
-    <para>
-      First fix one of the tests:
-    </para>
-
-<screen><userinput>sed -e "/DT/s;| sort;| sed 's/@@libjansson.*//' &amp;;" \
-    -i test/suites/api/check-exports</userinput></screen>
-
-    <para>
-      Install <application>jansson</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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libjansson.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libjansson">
-        <term><filename class="libraryfile">libjansson.so</filename></term>
-        <listitem>
-          <para>
-            contains an API for encoding, decoding, and manipulating JSON data
-          </para>
-          <indexterm zone="jansson libjansson">
-            <primary sortas="c-libjansson">libjansson.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/json-c.xml
===================================================================
--- general/genlib/json-c.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 json-c-download-http "https://s3.amazonaws.com/json-c_releases/releases/json-c-&json-c-version;.tar.gz">
-  <!ENTITY json-c-download-ftp  " ">
-  <!ENTITY json-c-md5sum        "bad8f5e91b7b2563ee2d507054c70eb2">
-  <!ENTITY json-c-size          "384 KB">
-  <!ENTITY json-c-buildsize     "7.9 MB">
-  <!ENTITY json-c-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="json-c" xreflabel="JSON-C-&json-c-version;">
-  <?dbhtml filename="json-c.html"?>
-
-
-  <title>JSON-C-&json-c-version;</title>
-
-  <indexterm zone="json-c">
-    <primary sortas="a-JSON-C">JSON-C</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JSON-C</title>
-
-    <para>
-      The <application>JSON-C</application> implements a reference counting
-      object model that allows you to easily construct JSON objects in C,
-      output them as JSON formatted strings and parse JSON formatted strings
-      back into the C representation of JSON objects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&json-c-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&json-c-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &json-c-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &json-c-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &json-c-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &json-c-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JSON-C Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="graphviz"/> (for dot tool)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JSON-C</title>
-<!--
-    <note>
-      <para>
-        This package does not support parallel build.
-      </para>
-    </note>
--->
-    <para>
-      Install <application>JSON-C</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DBUILD_STATIC_LIBS=OFF     \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have installed <xref linkend="doxygen" role="nodep"/> and
-      <xref linkend="graphviz" role="nodep"/>, you can build the documentation
-      by running the following command:
-    </para>
-
-<screen remap="doc"><userinput>doxygen doc/Doxyfile</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>
-
-    <para>
-      If you built the documentation, install it by running the following
-      commands as the &root; user:
-    </para>
-
-<screen role="root" remap="doc"><userinput>install -d -vm755 /usr/share/doc/json-c-&json-c-version; &amp;&amp;
-install -v -m644 doc/html/* /usr/share/doc/json-c-&json-c-version;</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>
-
-  </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>
-          libjson-c.so
-        </seg>
-        <seg>
-          /usr/include/json-c
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libjson-c">
-        <term><filename class="libraryfile">libjson-c.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JSON-C</application> API functions
-          </para>
-          <indexterm zone="json-c libjson-c">
-            <primary sortas="c-libjson-c">libjson-c.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/json-glib.xml
===================================================================
--- general/genlib/json-glib.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 json-glib-download-http "&gnome-download-http;/json-glib/1.8/json-glib-&json-glib-version;.tar.xz">
-  <!ENTITY json-glib-download-ftp  " ">
-  <!ENTITY json-glib-md5sum        "f1aac2b8a17fd68646653cc4d8426486">
-  <!ENTITY json-glib-size          "156 KB">
-  <!ENTITY json-glib-buildsize     "7.8 MB (with tests)">
-  <!ENTITY json-glib-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="json-glib" xreflabel="JSON-GLib-&json-glib-version;">
-  <?dbhtml filename="json-glib.html"?>
-
-
-  <title>JSON-GLib-&json-glib-version;</title>
-
-  <indexterm zone="json-glib">
-    <primary sortas="a-JSON-GLib">JSON-GLib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to JSON GLib</title>
-
-    <para>
-      The <application>JSON GLib</application> package is a library
-      providing serialization and deserialization support for the JavaScript
-      Object Notation (JSON) format described by RFC 4627.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&json-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&json-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &json-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &json-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &json-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &json-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">JSON-GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required if building
-      GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of JSON GLib</title>
-
-    <para>
-      Install <application>JSON GLib</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=disabled</option>: Add this option if you have
-      <xref role="nodep" linkend="gtk-doc"/> installed and do not wish to
-      generate the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          json-glib-format and json-glib-validate
-        </seg>
-        <seg>
-          libjson-glib-1.0.so
-        </seg>
-        <seg>
-          /usr/{include,{libexec,share{/installed-tests}/json-glib-1.0 and
-          /usr/share/gtk-doc/html/json-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="json-glib-format">
-        <term><command>json-glib-format</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface to format JSON data
-          </para>
-          <indexterm zone="json-glib json-glib-format">
-            <primary sortas="b-json-glib-format">json-glib-format</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="json-glib-validate">
-        <term><command>json-glib-validate</command></term>
-        <listitem>
-          <para>
-            is a simple command line interface to validate JSON data
-          </para>
-          <indexterm zone="json-glib json-glib-validate">
-            <primary sortas="b-json-glib-validate">json-glib-validate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjson-glib-1">
-        <term><filename class="libraryfile">libjson-glib-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>JSON GLib</application> API functions
-          </para>
-          <indexterm zone="json-glib libjson-glib-1">
-            <primary sortas="c-libjson-glib-1">libjson-glib-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/keyutils-test-kernel.xml
===================================================================
--- general/genlib/keyutils-test-kernel.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>S</emphasis>ecurity options ---&gt;
-  [*] <emphasis role='blue'>E</emphasis>nable access key retention support                                 [KEYS]
-  [*]   <emphasis role='blue'>L</emphasis>arge payload keys                                            [BIG_KEYS]
-  [*]   <emphasis role='blue'>D</emphasis>iffie-Hellman operations on retained keys           [KEY_DH_OPERATIONS]
-
--*- <emphasis role='blue'>C</emphasis>ryptographic API ---&gt;                                              [CRYPTO]
-  <emphasis role='blue'>P</emphasis>ublic-key cryptography ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>R</emphasis>SA (Rivest-Shamir-Adleman)                               [CRYPTO_RSA]
-  H<emphasis role='blue'>a</emphasis>shes, digests, and MACs ---&gt;
-    &lt;*/M&gt; <emphasis role='blue'>S</emphasis>HA-1                                                    [CRYPTO_SHA1]
-  [*] <emphasis role='blue'>A</emphasis>symmetric (public-key cryptographic) key type ---&gt;  [ASYMMETRIC_KEY_TYPE]
-    &lt;*&gt; <emphasis role='blue'>A</emphasis>symmetric public-key crypto algorithm subtype
-                                            ...  [ASYMMETRIC_PUBLIC_KEY_SUBTYPE]
-    # If not built into the kernel, [SYSTEM_TRUSTED_KEYRING] won't show up;
-    # building as a module won't work:
-    &lt;*&gt;   <emphasis role='blue'>X</emphasis>.509 certificate parser                     [X509_CERTIFICATE_PARSER]
-  <emphasis role='blue'>C</emphasis>ertificates for signature checking ---&gt;
-    [*] <emphasis role='blue'>P</emphasis>rovide system-wide ring of trusted keys        [SYSTEM_TRUSTED_KEYRING]
-    [*]   <emphasis role='blue'>P</emphasis>rovide a keyring to which extra trustable keys may be added
-                                                ...  [SECONDARY_TRUSTED_KEYRING]
-    [*] <emphasis role='blue'>P</emphasis>rovide system-wide ring of blacklisted keys  [SYSTEM_BLACKLIST_KEYRING]
-
-<emphasis role='blue'>L</emphasis>ibrary routines ---&gt;
-  <emphasis role='blue'>C</emphasis>rypto library routines ---&gt;
-    # If not built into the kernel, [BIG_KEYS] won't show up;
-    # building as a module won't work:
-    &lt;*&gt; <emphasis role='blue'>C</emphasis>haCha20-Poly1305 AEAD support (8-byte nonce library version)
-                                              ...  [CRYPTO_LIB_CHACHA20POLY1305]</screen>
Index: general/genlib/keyutils.xml
===================================================================
--- general/genlib/keyutils.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,255 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 keyutils-download-http "https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-&keyutils-version;.tar.gz">
-  <!ENTITY keyutils-download-ftp  " ">
-  <!ENTITY keyutils-md5sum        "6b70b2b381c1b6d9adfaf66d5d3e7c00">
-  <!ENTITY keyutils-size          "136 KB">
-  <!ENTITY keyutils-buildsize     "2.6 MB (with tests)">
-  <!ENTITY keyutils-time          "less than 0.1 SBU (add 0.4 SBU for tests)">
-]>
-
-<sect1 id="keyutils" xreflabel="keyutils-&keyutils-version;">
-  <?dbhtml filename="keyutils.html"?>
-
-
-  <title>keyutils-&keyutils-version;</title>
-
-  <indexterm zone="keyutils">
-    <primary sortas="a-keyutils">keyutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to keyutils</title>
-
-    <para>
-      <application>Keyutils</application> is a set of utilities for managing
-      the key retention facility in the kernel, which can be used by
-      filesystems, block devices and more to gain and retain the authorization
-      and encryption keys required to perform secure operations.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&keyutils-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&keyutils-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &keyutils-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &keyutils-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &keyutils-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &keyutils-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Keyutils Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lsb-tools"/> (referred by the test suite)
-    </para>
-  </sect2>
-
-  <sect2 role="kernel" id="keyutils-test-kernel"
-         xreflabel="Keyutils Kernel Configuration">
-    <title>Kernel Configuration</title>
-
-    <para>
-      If running the test suite, some tests needs the following kernel
-      features enabled:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="keyutils-test-kernel.xml"/>
-
-    <indexterm zone="keyutils keyutils-test-kernel">
-      <primary sortas="d-keyutils">keyutils (testing)</primary>
-    </indexterm>
-  </sect2>
-  <sect2 role="installation">
-    <title>Installation of keyutils</title>
-
-    <para>
-      Install <application>keyutils</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make NO_ARLIB=1 LIBDIR=/usr/lib BINDIR=/usr/bin SBINDIR=/usr/sbin install</userinput></screen>
-
-    <para>
-      The test suite can only run after installing this package.
-      To test the results, issue, as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" remap="test"><userinput>make -k test</userinput></screen>
-
-    <para>
-      If <xref linkend='lsb-tools'/> is not installed, the test suite will
-      output some lines complaining the <command>lsb_release</command>
-      command not available but it won't affect the test result.
-    </para>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--
-    <para>
-      <command>sed ... Makefile</command>: This command ensures the pkgconfig
-      file is placed in the correct directory.
-    </para>
-
-    <para>
-      <command>sed ... tests/toolbox.inc.sh</command>: In LFS, GCC has been
-      configured with <option>- -enable-default-pie</option> so
-      <command>/usr/bin/bash</command> is a PIE, but the test script does
-      not anticipate it.  Fix this oversight so the test can run on a LFS
-      system.
-    </para>
--->
-
-    <para>
-      <parameter>NO_ARLIB=1</parameter>: This make flag disables installing the
-      static library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring keyutils</title>
-
-    <sect3 id="keyutils-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/request-key.conf</filename> and
-        <filename>/etc/request-key.d/*</filename>
-      </para>
-
-      <indexterm zone="keyutils keyutils-config">
-        <primary sortas="e-etc-request-key.conf">/etc/request-key.conf</primary>
-      </indexterm>
-
-      <indexterm zone="keyutils keyutils-config">
-        <primary sortas="e-etc-request-key.d">/etc/request-key.d/*</primary>
-      </indexterm>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>keyctl, key.dns_resolver, and request-key</seg>
-        <seg>libkeyutils.so</seg>
-        <seg>/etc/keyutils,
-        /etc/request-key.d,
-        and /usr/share/keyutils</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keyctl">
-        <term><command>keyctl</command></term>
-        <listitem>
-          <para>
-            controls the key management facility with a variety of subcommands
-          </para>
-          <indexterm zone="keyutils keyctl">
-            <primary sortas="b-keyctl">keyctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="key.dns_resolver">
-        <term><command>key.dns_resolver</command></term>
-        <listitem>
-          <para>
-            is invoked by <command>request-key</command> on behalf of the
-            kernel when kernel services (such as NFS, CIFS and AFS) need to
-            perform a hostname lookup and the kernel does not have the key
-            cached.  It is not ordinarily intended to be called directly
-          </para>
-          <indexterm zone="keyutils key.dns_resolver">
-            <primary sortas="b-key.dns_resolver">key.dns_resolver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="request-key">
-        <term><command>request-key</command></term>
-        <listitem>
-          <para>
-            is invoked by the kernel when the kernel is asked for a key that it
-            doesn't have immediately available. The kernel creates a temporary
-            key and then calls out to this program to instantiate it.  It is
-            not intended to be called directly
-          </para>
-          <indexterm zone="keyutils request-key">
-            <primary sortas="b-request-keyt-key">request-key</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libkeyutils">
-        <term><filename class="libraryfile">libkeyutils.so</filename></term>
-        <listitem>
-          <para>
-            contains the keyutils library API instantiation
-          </para>
-          <indexterm zone="keyutils libkeyutils">
-            <primary sortas="c-libkeyutils">libkeyutils.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/kirigami-addons.xml
===================================================================
--- general/genlib/kirigami-addons.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 kirigami-addons-download-http "https://download.kde.org/stable/kirigami-addons/kirigami-addons-&kirigami-addons-version;.tar.xz">
-  <!ENTITY kirigami-addons-download-ftp  " ">
-  <!ENTITY kirigami-addons-md5sum        "14dc120c21d6fe165cac577f26f4d6e3">
-  <!ENTITY kirigami-addons-size          "1.0 MB">
-  <!ENTITY kirigami-addons-buildsize     "35 MB">
-  <!ENTITY kirigami-addons-time          "0.4 SBU (Using parallelism=4">
-]>
-
-<sect1 id="kirigami-addons" xreflabel="kirigami-addons-&kirigami-addons-version;">
-  <?dbhtml filename="kirigami-addons.html"?>
-
-  <title>kirigami-addons-&kirigami-addons-version;</title>
-
-  <indexterm zone="kirigami-addons">
-    <primary sortas="g-kirigami-addons">kirigami-addons</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kirigami-addons</title>
-
-    <para>
-      This package provides add-on qml files for the Kirigami framework.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kirigami-addons-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kirigami-addons-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kirigami-addons-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kirigami-addons-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kirigami-addons-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kirigami-addons-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kirigami-addons Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kf6-frameworks"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vulkan-loader"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kirigami-addons</title>
-
-    <para>
-      Install <application>kirigami-addons</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE__INSTALL_PREFIX=$KF6_PREFIX \
-      -D CMAKE_BUILD_TYPE=Release          \
-      -D BUILD_TESTING=OFF                 \
-       ..                                  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This packages does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!-- We don't need to repeat this for every package
-  <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>
-
-  </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>None</seg>
-        <seg>
-          $KF6_PREFIX/lib/qml/org/kde/kirigamiaddons and
-          $KF6_PREFIX/lib/cmake/KF6KirigamiAddons
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libaio.xml
===================================================================
--- general/genlib/libaio.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libaio-download-http "https://pagure.io/libaio/archive/libaio-&libaio-version;/libaio-&libaio-version;.tar.gz">
-  <!ENTITY libaio-download-ftp  " ">
-  <!ENTITY libaio-md5sum        "605237f35de238dfacc83bcae406d95d">
-  <!ENTITY libaio-size          "48 KB">
-  <!ENTITY libaio-buildsize     "1.0 MB">
-  <!ENTITY libaio-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libaio" xreflabel="libaio-&libaio-version;">
-  <?dbhtml filename="libaio.html"?>
-
-
-  <title>libaio-&libaio-version;</title>
-
-  <indexterm zone="libaio">
-    <primary sortas="a-libaio">libaio</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libaio</title>
-
-    <para>
-      The <application>libaio</application> package is an asynchronous I/O
-      facility ("async I/O", or "aio") that has a richer API and capability set
-      than the simple POSIX async I/O facility.  This library, libaio, provides
-      the Linux-native API for async I/O.  The POSIX async I/O facility
-      requires this library in order to provide kernel-accelerated async I/O
-      capabilities, as do applications which require the Linux-native async I/O
-      API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libaio-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libaio-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libaio-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libaio-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libaio-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libaio-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libaio</title>
-
-    <para>
-      First, disable the installation of the static library:
-    </para>
-
-<screen><userinput>sed -i '/install.*libaio.a/s/^/#/' src/Makefile</userinput></screen>
-
-    <para>
-      Build <application>libaio</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make partcheck</command>.
-    </para>
-
-    <para>
-      Now, install the package 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 Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libaio.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libaio-lib">
-        <term><filename class="libraryfile">libaio.so</filename></term>
-        <listitem>
-          <para>
-            is the libaio library
-          </para>
-          <indexterm zone="libaio libaio-lib">
-            <primary sortas="c-libaio">libaio.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libarchive.xml
===================================================================
--- general/genlib/libarchive.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,223 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libarchive-download-http "https://github.com/libarchive/libarchive/releases/download/v&libarchive-version;/libarchive-&libarchive-version;.tar.xz">
-  <!ENTITY libarchive-download-ftp  " ">
-  <!ENTITY libarchive-md5sum        "b60683739a16ff6f00f32aa3516402ed">
-  <!ENTITY libarchive-size          "5.2 MB">
-  <!ENTITY libarchive-buildsize     "42 MB (add 32 MB for tests)">
-  <!ENTITY libarchive-time          "0.4 SBU (add 0.6 SBU for tests)">
-]>
-
-<sect1 id="libarchive" xreflabel="libarchive-&libarchive-version;">
-  <?dbhtml filename="libarchive.html"?>
-
-
-  <title>libarchive-&libarchive-version;</title>
-
-  <indexterm zone="libarchive">
-    <primary sortas="a-libarchive">libarchive</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libarchive</title>
-
-    <para>
-      The <application>libarchive</application> library provides a single
-      interface for reading/writing various compression formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libarchive-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libarchive-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libarchive-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libarchive-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libarchive-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libarchive-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libarchive-&libarchive-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libarchive Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libxml2"/>,
-      <xref linkend="lzo"/>, 
-      <xref linkend="nettle"/>, and
-      <xref linkend="pcre2"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libarchive</title>
-
-    <para>
-      Install <application>libarchive</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>LC_ALL=C 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"/>
-
-    <para>
-      <option>--without-xml2</option>: This switch sets expat for xar archive
-      format support instead of preferred libxml2 if both packages are installed.
-    </para>
-
-    <para>
-      <option>--without-nettle</option>: This switch sets OpenSSL for crypto
-      support instead of preferred Nettle if both packages are installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bsdcat, bsdcpio, bsdtar, and bsdunzip
-        </seg>
-        <seg>
-          libarchive.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bsdcat">
-        <term><command>bsdcat</command></term>
-        <listitem>
-          <para>
-            expands files to standard output
-          </para>
-          <indexterm zone="libarchive bsdcat">
-            <primary sortas="b-bsdcat">bsdcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdcpio">
-        <term><command>bsdcpio</command></term>
-        <listitem>
-          <para>
-            is a tool similar to <command>cpio</command>
-          </para>
-          <indexterm zone="libarchive bsdcpio">
-            <primary sortas="b-bsdcpio">bsdcpio</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdtar">
-        <term><command>bsdtar</command></term>
-        <listitem>
-          <para>
-            is a tool similar to GNU <command>tar</command>
-          </para>
-          <indexterm zone="libarchive bsdtar">
-            <primary sortas="b-bsdtar">bsdtar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bsdunzip">
-        <term><command>bsdunzip</command></term>
-        <listitem>
-          <para>
-            is a tool similar to Info-ZIP <command>unzip</command>
-          </para>
-          <indexterm zone="libarchive bsdunzip">
-            <primary sortas="b-bsdunzip">bsdunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libarchive-lib">
-        <term><filename class="libraryfile">libarchive.so</filename></term>
-        <listitem>
-          <para>
-            is a library that can create and read several streaming
-            archive formats
-          </para>
-          <indexterm zone="libarchive libarchive-lib">
-            <primary sortas="c-libarchive">libarchive.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libassuan.xml
===================================================================
--- general/genlib/libassuan.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,198 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libassuan-download-http "&gnupg-http;/libassuan/libassuan-&libassuan-version;.tar.bz2">
-  <!ENTITY libassuan-download-ftp  " ">
-  <!ENTITY libassuan-md5sum        "fe8310b1a5bcaa32d70af476fa2b942a">
-  <!ENTITY libassuan-size          "592 KB">
-  <!ENTITY libassuan-buildsize     "7.9 MB (with tests, add 3.4 MB for documentation)">
-  <!ENTITY libassuan-time          "0.1 SBU (with tests and documentation)">
-]>
-
-<sect1 id="libassuan" xreflabel="libassuan-&libassuan-version;">
-  <?dbhtml filename="libassuan.html"?>
-
-
-  <title>libassuan-&libassuan-version;</title>
-
-  <indexterm zone="libassuan">
-    <primary sortas="a-libassuan">libassuan</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libassuan</title>
-
-    <para>
-      The <application>libassuan</application> package contains an inter
-      process communication library used by some of the other
-      <application>GnuPG</application> related packages.
-      <application>libassuan</application>'s primary use is to allow a
-      client to interact with a non-persistent server.
-      <application>libassuan</application> is not, however, limited to
-      use with <application>GnuPG</application> servers and clients. It
-      was designed to be flexible enough to meet the demands of many
-      transaction based environments with non-persistent servers.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libassuan-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libassuan-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libassuan-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libassuan-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libassuan-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libassuan-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libassuan 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="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libassuan</title>
-
-    <para>
-      Install <application>libassuan</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make                      &amp;&amp;
-
-make -C doc html                                                       &amp;&amp;
-makeinfo --html --no-split -o doc/assuan_nochunks.html doc/assuan.texi &amp;&amp;
-makeinfo --plaintext       -o doc/assuan.txt           doc/assuan.texi
-</userinput></screen>
-
-    <para>
-      The above commands build the documentation in html and plaintext formats.
-      If you wish to build alternate formats of the documentation, you must
-      have <xref linkend="texlive"/> installed and issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf ps</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/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan.html/* \
-                    /usr/share/doc/libassuan-&libassuan-version;/html &amp;&amp;
-install -v -m644 doc/assuan_nochunks.html \
-                    /usr/share/doc/libassuan-&libassuan-version;      &amp;&amp;
-install -v -m644 doc/assuan.{txt,texi} \
-                    /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
-
-    <para>
-      If you built alternate formats of the documentation, install them by
-      running the following commands as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644  doc/assuan.{pdf,ps,dvi} \
-                  /usr/share/doc/libassuan-&libassuan-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          libassuan-config
-        </seg>
-        <seg>
-          libassuan.so
-        </seg>
-        <seg>
-          /usr/share/doc/libassuan-&libassuan-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libassuan-config">
-        <term><command>libassuan-config</command></term>
-        <listitem>
-          <para>
-            is a <filename class="libraryfile">libassuan</filename> build information script
-          </para>
-          <indexterm zone="libassuan libassuan-config">
-            <primary sortas="b-libassuan-config">libassuan-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libassuan-lib">
-        <term><filename class="libraryfile">libassuan.so</filename></term>
-        <listitem>
-          <para>
-            is an inter process communication library which
-            implements the Assuan protocol
-          </para>
-          <indexterm zone="libassuan libassuan-lib">
-            <primary sortas="c-libassuan">libassuan.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libatasmart.xml
===================================================================
--- general/genlib/libatasmart.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libatasmart-download-http "https://0pointer.de/public/libatasmart-&libatasmart-version;.tar.xz">
-  <!ENTITY libatasmart-download-ftp  " ">
-  <!ENTITY libatasmart-md5sum        "53afe2b155c36f658e121fe6def33e77">
-  <!ENTITY libatasmart-size          "248 KB">
-  <!ENTITY libatasmart-buildsize     "3 MB">
-  <!ENTITY libatasmart-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libatasmart" xreflabel="libatasmart-&libatasmart-version;">
-  <?dbhtml filename="libatasmart.html"?>
-
-
-  <title>libatasmart-&libatasmart-version;</title>
-
-  <indexterm zone="libatasmart">
-    <primary sortas="a-libatasmart">libatasmart</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libatasmart</title>
-
-    <para>
-      The <application>libatasmart</application> package is a disk reporting
-      library. It only supports a subset of the ATA S.M.A.R.T. functionality.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libatasmart-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libatasmart-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libatasmart-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libatasmart-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libatasmart-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libatasmart-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <para condition="html" role="usernotes">Editor Notes:
-      <ulink url="&blfs-wiki;/libatasmart"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libatasmart</title>
-
-    <para>
-      Install <application>libatasmart</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 docdir=/usr/share/doc/libatasmart-&libatasmart-version; 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>
-          skdump and sktest
-        </seg>
-        <seg>
-          libatasmart.so
-        </seg>
-        <seg>
-          /usr/share/doc/libatasmart-&libatasmart-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="skdump">
-        <term><command>skdump</command></term>
-        <listitem>
-          <para>
-            is a utility that reports on the status of the disk
-          </para>
-          <indexterm zone="libatasmart skdump">
-            <primary sortas="b-skdump">skdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sktest">
-        <term><command>sktest</command></term>
-        <listitem>
-          <para>
-            is a utility to issue disks tests
-          </para>
-          <indexterm zone="libatasmart sktest">
-            <primary sortas="b-sktest">sktest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatasmart-lib">
-        <term><filename class="libraryfile">libatasmart.so</filename></term>
-        <listitem>
-          <para>
-            contains the ATA S.M.A.R.T API functions
-          </para>
-          <indexterm zone="libatasmart libatasmart-lib">
-            <primary sortas="c-libatasmart">libatasmart.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libatomic_ops.xml
===================================================================
--- general/genlib/libatomic_ops.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libatomic_ops-download-http "https://github.com/ivmai/libatomic_ops/releases/download/v&libatomic_ops-version;/libatomic_ops-&libatomic_ops-version;.tar.gz">
-  <!ENTITY libatomic_ops-download-ftp  " ">
-  <!ENTITY libatomic_ops-md5sum        "d07b3d8369d7f9efdca59f7501dd1117">
-  <!ENTITY libatomic_ops-size          "516 KB">
-  <!ENTITY libatomic_ops-buildsize     "6.8 MB (with tests)">
-  <!ENTITY libatomic_ops-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libatomic_ops" xreflabel="libatomic_ops-&libatomic_ops-version;">
-  <?dbhtml filename="libatomic_ops.html"?>
-
-
-  <title>libatomic_ops-&libatomic_ops-version;</title>
-
-  <indexterm zone="libatomic_ops">
-    <primary sortas="a-libatomic_ops">libatomic_ops</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libatomic_ops</title>
-
-    <para>
-      <application>libatomic_ops</application> provides implementations for
-      atomic memory update operations on a number of architectures. This allows
-      direct use of these in reasonably portable code. Unlike earlier similar
-      packages, this one explicitly considers memory barrier semantics, and
-      allows the construction of code that involves minimum overhead across a
-      variety of architectures.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libatomic_ops-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libatomic_ops-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libatomic_ops-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libatomic_ops-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libatomic_ops-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libatomic_ops-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libatomic_ops</title>
-
-    <para>
-      Install <application>libatomic_ops</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --enable-shared  \
-            --disable-static \
-            --docdir=/usr/share/doc/libatomic_ops-&libatomic_ops-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To check the results, issue <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch enables building of the
-      <filename class="libraryfile">libatomic_ops</filename> shared libraries.
-    </para>
-
-    <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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatomic_ops.so and libatomic_ops_gpl.so
-        </seg>
-        <seg>
-          /usr/include/libatomic_ops and
-          /usr/share/doc/libatomic_ops-&libatomic_ops-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatomic_ops-lib">
-        <term><filename class="libraryfile">libatomic_ops.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for atomic memory operations
-          </para>
-          <indexterm zone="libatomic_ops libatomic_ops-lib">
-            <primary sortas="c-libatomic_ops">libatomic_ops.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libblockdev.xml
===================================================================
--- general/genlib/libblockdev.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,275 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libblockdev-download-http
-    "https://github.com/storaged-project/libblockdev/releases/download/&libblockdev-version;-1/libblockdev-&libblockdev-version;.tar.gz">
-  <!ENTITY libblockdev-download-ftp " ">
-  <!ENTITY libblockdev-md5sum        "28d43f2d6bff85245502a8c4c478c5a3">
-  <!ENTITY libblockdev-size          "1.0 MB">
-  <!ENTITY libblockdev-buildsize     "13 MB">
-  <!ENTITY libblockdev-time          "0.1 SBU">
-]>
-
-<sect1 id="libblockdev" xreflabel="libblockdev-&libblockdev-version;">
-  <?dbhtml filename="libblockdev.html"?>
-
-
-  <title>libblockdev-&libblockdev-version;</title>
-
-  <indexterm zone="libblockdev">
-    <primary sortas="a-libblockdev">libblockdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libblockdev</title>
-
-    <para>
-      libblockdev is a C library supporting GObject Introspection for
-      manipulation of block devices. It has a plugin-based architecture where
-      each technology (like LVM, Btrfs, MD RAID, Swap,...) is implemented in a
-      separate plugin, possibly with multiple implementations (e.g. using LVM
-      CLI or the new LVM DBus API).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libblockdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libblockdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libblockdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libblockdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libblockdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libblockdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libblockdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cryptsetup"/>,
-      <xref linkend="keyutils"/>,
-      <xref linkend="libbytesize"/>,
-      <xref linkend="libnvme"/>, and
-      <xref linkend="lvm2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="btrfs-progs"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="mdadm"/>,
-      <xref linkend="parted"/>,
-      <ulink url="https://github.com/felixonmars/volume_key">volume_key</ulink>,
-<!--      <xref linkend="volume_key"/>,-->
-<!--      <ulink url="https://people.redhat.com/~heinzm/sw/dmraid/">dmraid</ulink>, -->
-<!--      <ulink url="https://bcachefs.org/">bcachefs</ulink>, -->
-      <ulink url="https://github.com/pmem/ndctl">ndctl</ulink>, and
-      <ulink url="https://github.com/Datera/targetcli">targetcli</ulink>
-      (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libblockdev</title>
-<!--
-    <para>
-      Fix the usage of a glib function deprecated for security:
-    </para>
-
-<screen><userinput>sed 's/g_memdup/&amp;2/' -i             \
-    src/lib/plugin_apis/vdo.{c,api} \
-    src/plugins/vdo.c</userinput></screen>
--->
-    <para>
-      Install <application>libblockdev</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr      \
-            --sysconfdir=/etc  \
-            --with-python3     \
-            --without-escrow   \
-            --without-gtk-doc  \
-            --without-lvm      \
-            --without-lvm_dbus \
-            --without-nvdimm   \
-            --without-tools    &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The test suite requires <application>targetcli</application>, which
-      is not a part of BLFS.
-    </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>--without-escrow</parameter>: This switch allows building
-      <application>libblockdev</application> without volume_key installed.  
-    </para>
-
-    <para>
-      <parameter>--without-lvm</parameter>
-      <parameter>--without-lvm_dbus</parameter>
-      <parameter>--without-tools</parameter>: The combination of these
-      switches allows
-      building <application>libblockdev</application> without
-      <xref linkend="parted"/> installed.  Remove it if you've installed
-      <xref linkend="parted"/> and wish to build the
-      <command>lvm-cache-stats</command> or <command>vfat-resize</command>
-      utilities, or wish <application>libblockdev</application> to support
-      logical volumes.
-    </para>
-
-    <para>
-      <option>--without-btrfs --without-mdraid --without-tools</option>:
-      The combination of these switches allows building
-      <application>libblockdev</application> without
-      <xref linkend="libbytesize"/> installed.  The
-      <option>--without-mdraid</option> option will break
-      <xref linkend="udisks2"/>, so don't use it unless you really know what
-      you are doing.
-    </para>
-
-    <para>
-      <option>--without-crypto</option>: This switch allows building
-      <application>libblockdev</application> without
-      <xref linkend="cryptsetup"/> or <xref linkend="keyutils"/> installed.
-      This switch will break <xref linkend="udisks2"/>, so don't use it
-      unless you really know what you are doing.
-    </para>
-
-    <para>
-      <option>--without-dm --without-lvm --without-lvm_dbus
-      --without-mpath</option>: The combination of these switches allows
-      building <application>libblockdev</application> without
-      <xref linkend="lvm2"/> installed.  The <option>--without-dm</option>
-      and <option>--without-mpath</option> options are not in the instructions
-      provided by the book because <xref linkend="lvm2"/> is required for
-      <xref linkend="cryptsetup"/> and <xref linkend="cryptsetup"/> is a
-      recommended dependency of <application>libblockdev</application> anyway.
-    </para>
-
-    <para>
-      <option>--without-nvme</option>: This switch allows building
-      <application>libblockdev</application> without
-      <xref linkend="libnvme"/> installed.  This switch will break
-      <xref linkend="udisks2"/>, so don't use it unless you really know what
-      you are doing.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          lvm-cache-stats and vfat-resize (both optional)
-        </seg>
-        <seg>
-          libbd_btrfs.so,
-          libbd_crypto.so,
-          libbd_dm.so,
-          libbd_fs.so,
-          libbd_loop.so,
-          libbd_lvm.so (optional),
-          libbd_lvm-dbus.so (optional),
-          libbd_mdraid.so,
-          libbd_mpath.so,
-          libbd_nvme.so,
-          libbd_part.so,
-          libbd_swap.so,
-          libbd_utils.so, and
-          libblockdev.so
-        </seg>
-        <seg>
-          /etc/libblockdev,
-          /usr/include/blockdev, and
-          /usr/share/gtk-doc/html/libblockdev (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="lvm-cache-stats">
-        <term><command>lvm-cache-stats</command></term>
-        <listitem>
-          <para>
-            prints statistics on caches on LVM Logical Volumes
-          </para>
-          <indexterm zone="libblockdev lvm-cache-stats">
-            <primary sortas="b-lvm-cache-stats">lvm-cache-stats</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vfat-resize">
-        <term><command>vfat-resize</command></term>
-        <listitem>
-          <para>
-            resizes <systemitem class="filesystem">vfat</systemitem>
-            file systems
-          </para>
-          <indexterm zone="libblockdev vfat-resize">
-            <primary sortas="b-vfat-resize">vfat-resize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libbytesize.xml
===================================================================
--- general/genlib/libbytesize.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,185 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libbytesize-download-http "https://github.com/storaged-project/libbytesize/releases/download/&libbytesize-version;/libbytesize-&libbytesize-version;.tar.gz">
-  <!ENTITY libbytesize-download-ftp  " ">
-  <!ENTITY libbytesize-md5sum        "2ed2ad2e44c4017f016e1ca55be83e62">
-  <!ENTITY libbytesize-size          "452 KB">
-  <!ENTITY libbytesize-buildsize     "3.5 MB">
-  <!ENTITY libbytesize-time          "less than 0.1 SBU (including tests)">
-]>
-
-<sect1 id="libbytesize" xreflabel="libbytesize-&libbytesize-version;">
-  <?dbhtml filename="libbytesize.html"?>
-
-
-  <title>libbytesize-&libbytesize-version;</title>
-
-  <indexterm zone="libbytesize">
-    <primary sortas="a-libbytesize">libbytesize</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libbytesize</title>
-
-    <para>
-      The <application>libbytesize</application> package is a library which
-      facilitates the common operations with sizes in bytes.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libbytesize-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libbytesize-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libbytesize-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libbytesize-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libbytesize-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libbytesize-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libbytesize Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="pcre2"/> and
-      <xref linkend="pygments"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-
-    <para role="recommended">
-      <xref linkend="six"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://github.com/rhinstaller/pocketlint/releases">pocketlint</ulink> (python module for one test), and
-      <ulink url="https://pypi.python.org/pypi/polib">polib</ulink> (python module for one test)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libbytesize</title>
-
-    <para>
-      Install <application>libbytesize</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have the optional python modules installed, the regression
-      tests can be run with: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-i -without-python2</option>: If
-      <application>Python 2</application> is installed, use this switch to
-      prevent the use of <application>Python 2</application>. This may be
-      required to run the tests, if some of the needed python modules have been
-      installed for <application>Python 3</application> only.
-    </para>
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          bscalc
-        </seg>
-        <seg>
-          libbytesize.so
-        </seg>
-        <seg>
-          /usr/include/bytesize and
-          /usr/lib/python&python3-majorver;/site-packages/bytesize
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bscalc">
-        <term><command>bscalc</command></term>
-        <listitem>
-          <para>
-            converts from a larger unit, such as MB or TB,
-            back to a value in bytes
-          </para>
-          <indexterm zone="libbytesize bscalc">
-            <primary sortas="b-bscalc">bscalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbytesize-lib">
-        <term><filename class="libraryfile">libbytesize.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle common read/write operations
-            with sizes in bytes
-          </para>
-          <indexterm zone="libbytesize libbytesize-lib">
-            <primary sortas="c-libbytesize">libbytesize.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libcloudproviders.xml
===================================================================
--- general/genlib/libcloudproviders.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libcloudproviders-download-http "&gnome-download-http;/libcloudproviders/0.3/libcloudproviders-&libcloudproviders-version;.tar.xz">
-  <!ENTITY libcloudproviders-download-ftp  " ">
-  <!ENTITY libcloudproviders-md5sum        "f0f994bdc36fdfe9b31e3655b8071599">
-  <!ENTITY libcloudproviders-size          "24 KB">
-  <!ENTITY libcloudproviders-buildsize     "1.4 MB">
-  <!ENTITY libcloudproviders-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libcloudproviders" xreflabel="libcloudproviders-&libcloudproviders-version;">
-  <?dbhtml filename="libcloudproviders.html"?>
-
-  <title>libcloudproviders-&libcloudproviders-version;</title>
-
-  <indexterm zone="libcloudproviders">
-    <primary sortas="a-libcloudproviders">libcloudproviders</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcloudproviders</title>
-
-    <para>
-      The <application>libcloudproviders</application> package contains a
-      library which provides a DBus API that allows cloud storage sync clients
-      to expose their services.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libcloudproviders-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libcloudproviders-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libcloudproviders-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libcloudproviders-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libcloudproviders-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libcloudproviders-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcloudproviders Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection; and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcloudproviders</title>
-
-    <para>
-      Install <application>libcloudproviders</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</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>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Denable-gtk-doc</option>: Use this switch if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to generate the
-      API documentation.
-    </para>
-
-  </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>
-          libcloudproviders.so
-        </seg>
-        <seg>
-          /usr/include/cloudproviders
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcloudproviders-lib">
-        <term><filename class="libraryfile">libcloudproviders.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a DBus API to allow cloud storage
-            sync clients to expose their services
-          </para>
-          <indexterm zone="libcloudproviders libcloudproviders-lib">
-            <primary sortas="c-libcloudproviders">libcloudproviders.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/libdaemon.xml
===================================================================
--- general/genlib/libdaemon.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdaemon-download-http "https://0pointer.de/lennart/projects/libdaemon/libdaemon-&libdaemon-version;.tar.gz">
-  <!ENTITY libdaemon-download-ftp  " ">
-  <!ENTITY libdaemon-md5sum        "509dc27107c21bcd9fbf2f95f5669563">
-  <!ENTITY libdaemon-size          "332 KB">
-  <!ENTITY libdaemon-buildsize     "3 MB">
-  <!ENTITY libdaemon-time          "0.1 SBU">
-]>
-
-<sect1 id="libdaemon" xreflabel="libdaemon-&libdaemon-version;">
-  <?dbhtml filename="libdaemon.html"?>
-
-
-  <title>libdaemon-&libdaemon-version;</title>
-
-  <indexterm zone="libdaemon">
-    <primary sortas="a-libdaemon">libdaemon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdaemon</title>
-
-    <para>
-      The <application>libdaemon</application> package is a lightweight C
-      library that eases the writing of UNIX daemons.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdaemon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdaemon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdaemon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdaemon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdaemon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdaemon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdaemon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="lynx"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdaemon</title>
-
-    <para>
-      Install <application>libdaemon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <application>Doxygen</application> installed and wish to
-      build the API documentation, issue the following command:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc doxygen</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 docdir=/usr/share/doc/libdaemon-&libdaemon-version; install</userinput></screen>
-
-    <para>
-      If you built the API documentation, install it using the following commands
-      as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<!-- there is a link from README.html to reference/html, so install there -->
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libdaemon-&libdaemon-version;/reference/html &amp;&amp;
-install -v -m644 doc/reference/html/* /usr/share/doc/libdaemon-&libdaemon-version;/reference/html &amp;&amp;
-install -v -m644 doc/reference/man/man3/* /usr/share/man/man3</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>
-          None
-        </seg>
-        <seg>
-          libdaemon.so
-        </seg>
-        <seg>
-          /usr/include/libdaemon and
-          /usr/share/doc/libdaemon-&libdaemon-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdaemon-lib">
-        <term><filename class="libraryfile">libdaemon.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libdaemon</application> API functions
-          </para>
-          <indexterm zone="libdaemon libdaemon-lib">
-            <primary sortas="c-libdaemon">libdaemon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libdisplay-info.xml
===================================================================
--- general/genlib/libdisplay-info.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libdisplay-info-download-http "https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/&libdisplay-info-version;/downloads//libdisplay-info-&libdisplay-info-version;.tar.xz">
-  <!ENTITY libdisplay-info-download-ftp  " ">
-  <!ENTITY libdisplay-info-md5sum        "56e8d2213d2aefd7defaaddfd9cb80e1">
-  <!ENTITY libdisplay-info-size          "t6 KB">
-  <!ENTITY libdisplay-info-buildsize     "2.4 MB">
-  <!ENTITY libdisplay-info-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libdisplay-info" xreflabel="libdisplay-info-&libdisplay-info-version;">
-  <?dbhtml filename="libdisplay-info.html"?>
-
-  <title>libdisplay-info-&libdisplay-info-version;</title>
-
-  <indexterm zone="libdisplay-info">
-    <primary sortas="a-libdisplay-info">libdisplay-info</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdisplay-info</title>
-
-    <para>
-      The <application>libdisplay-info</application> package provides 
-       a set of high-level and low-level functions to 
-       access detailed Extended Display Identification Data (EDID) information.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdisplay-info-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdisplay-info-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdisplay-info-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdisplay-info-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdisplay-info-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdisplay-info-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libdisplay-info Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="hwdata"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdisplay-info</title>
-
-    <para>
-      Install <application>libdisplay-info</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package requires special software to run tests.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.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>
-          libdisplay-info.so 
-        </seg>
-        <seg>
-          /usr/include/libdisplay-info
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdisplay-info-lib">
-        <term><filename class="libraryfile">libdisplay-info.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle operations
-            relating to NVMe devices.
-          </para>
-          <indexterm zone="libdisplay-info libdisplay-info-lib">
-            <primary sortas="c-libdisplay-info">libdisplay-info.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/libfam.xml
===================================================================
--- general/genlib/libfam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libfam.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="libfam" xreflabel="libfam">
+<?dbhtml filename="libfam.html" dir="general"?>
+<title>libfam</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/genlib/libfam/libfam.ent
===================================================================
--- general/genlib/libfam/libfam.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libfam/libfam.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY libfam SYSTEM "../libfam.xml">
Index: general/genlib/libgcrypt.xml
===================================================================
--- general/genlib/libgcrypt.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,247 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&gnupg-http;/libgcrypt/libgcrypt-&libgcrypt-version;.tar.bz2">
-  <!ENTITY libgcrypt-download-ftp  " ">
-  <!ENTITY libgcrypt-md5sum        "a8cada0b343e10dbee51c9e92d856a94">
-  <!ENTITY libgcrypt-size          "3.6 MB">
-  <!ENTITY libgcrypt-buildsize     "131 MB (with tests)">
-  <!ENTITY libgcrypt-time          "0.3 SBU (with documentation; add 0.4 SBU for tests)">
-]>
-
-<sect1 id="libgcrypt" xreflabel="libgcrypt-&libgcrypt-version;">
-  <?dbhtml filename="libgcrypt.html"?>
-
-
-  <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>
-
-    &lfs121_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"/> -->
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </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                      &amp;&amp;
-
-make -C doc 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>
-
-<!--  The commands for building the pdf and ps formats are broken.
-    <para>
-      The above commands build the documentation in html and plaintext
-      formats. If you wish to build alternate formats of the documentation, you
-      need <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>). Issue
-      the following command:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc pdf</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; &amp;&amp;
-
-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.{txt,texi} \
-                    /usr/share/doc/libgcrypt-&libgcrypt-version;</userinput></screen>
-<!--
-    <para>
-      If you built alternate formats of the documentation, install them by
-      issuing the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m644 doc/gcrypt.{pdf,ps,dvi} \
-                    /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.
-      Note that this breaks <xref linkend="cryptsetup"/>
-    </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="dumpsexp">
-        <term><command>dumpsexp</command></term>
-        <listitem>
-          <para>
-            is a debug tool for S-expressions
-          </para>
-          <indexterm zone="libgcrypt dumpsexp">
-            <primary sortas="b-dumpsexp">dumpsexp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmac256">
-        <term><command>hmac256</command></term>
-        <listitem>
-          <para>
-            is a standalone HMAC-SHA-256 implementation used to compute
-            an HMAC-SHA-256 authentication code
-          </para>
-          <indexterm zone="libgcrypt hmac256">
-            <primary sortas="b-hmac256">hmac256</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcrypt-config">
-        <term><command>libgcrypt-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use <filename class="libraryfile">libgcrypt</filename>
-          </para>
-          <indexterm zone="libgcrypt libgcrypt-config">
-            <primary sortas="b-libgcrypt-config">libgcrypt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mpicalc">
-        <term><command>mpicalc</command></term>
-        <listitem>
-          <para>
-            is a RPN (Reverse Polish Notation) calculator
-          </para>
-          <indexterm zone="libgcrypt mpicalc">
-            <primary sortas="b-mpicalc">mpicalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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.xml
===================================================================
--- general/genlib/libgpg-error.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "&gnupg-http;/libgpg-error/libgpg-error-&libgpg-error-version;.tar.bz2">
-  <!ENTITY libgpg-error-download-ftp  " ">
-  <!ENTITY libgpg-error-md5sum        "eb171d62d761f49e110b77b747d8a157">
-  <!ENTITY libgpg-error-size          "1.0 MB">
-  <!ENTITY libgpg-error-buildsize     "11 MB (with tests)">
-  <!ENTITY libgpg-error-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libgpg-error" xreflabel="libgpg-error-&libgpg-error-version;">
-  <?dbhtml filename="libgpg-error.html"?>
-
-
-  <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>
-
-    &lfs121_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>
-
-  </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 &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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gpg-error, gpgrt-config, and yat2m
-        </seg>
-        <seg>
-          libgpg-error.so
-        </seg>
-        <seg>
-          /usr/share/common-lisp/source/gpg-error,
-          /usr/share/libgpg-error, 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="gpgrt-config">
-        <term><command>gpgrt-config</command></term>
-        <listitem>
-          <para>
-            is a <command>pkg-config</command> style tool for querying the
-            information about installed version of libgpg-error
-          </para>
-          <indexterm zone="libgpg-error gpgrt-config">
-            <primary sortas="b-gpgrt-config">gpgrt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yat2m">
-        <term><command>yat2m</command></term>
-        <listitem>
-          <para>
-            extracts man pages from a Texinfo source
-          </para>
-          <indexterm zone="libgpg-error yat2m">
-            <primary sortas="b-yat2m">yat2m</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/libgrss.xml
===================================================================
--- general/genlib/libgrss.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgrss-download-http "&gnome-download-http;/libgrss/0.7/libgrss-0.7.0.tar.xz">
-  <!ENTITY libgrss-download-ftp  " ">
-  <!ENTITY libgrss-md5sum        "7c0ee46a82dc0e9610183fe9ef8c7c1d">
-  <!ENTITY libgrss-size          "356 KB">
-  <!ENTITY libgrss-buildsize     "10 MB">
-  <!ENTITY libgrss-time          "0.1 SBU">
-]>
-
-<sect1 id="libgrss" xreflabel="libgrss-&libgrss-version;">
-  <?dbhtml filename="libgrss.html"?>
-
-
-  <title>libgrss-&libgrss-version;</title>
-
-  <indexterm zone="libgrss">
-    <primary sortas="a-libgrss">libgrss</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgrss</title>
-
-    <para>
-      The <application>libgrss</application> package contains a library
-      designed to manipulate RSS and Atom feeds.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgrss-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgrss-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgrss-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgrss-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgrss-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgrss-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libgrss-&libgrss-version;-bugfixes-2.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgrss Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libsoup"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgrss</title>
-
-    <para>
-      Install <application>libgrss</application> by running the following
-      commands:
-    </para>
-
-
-<screen><userinput>patch -Np1 -i ../libgrss-&libgrss-version;-bugfixes-2.patch &amp;&amp;
-autoreconf -fv &amp;&amp;
-./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>
-          libgrss.so
-        </seg>
-        <seg>
-          /usr/include/libgrss and
-          /usr/share/doc/libgrss-&libgrss-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgrss-lib">
-        <term><filename class="libraryfile">libgrss.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions for handling RSS feeds
-          </para>
-          <indexterm zone="libgrss libgrss-lib">
-            <primary sortas="c-libgrss">libgrss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libgsf.xml
===================================================================
--- general/genlib/libgsf.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgsf-download-http "&gnome-download-http;/libgsf/1.14/libgsf-&libgsf-version;.tar.xz">
-  <!ENTITY libgsf-download-ftp  " ">
-  <!ENTITY libgsf-md5sum        "c64b4a29dd2e67749313f3917a12a709">
-  <!ENTITY libgsf-size          "692 KB">
-  <!ENTITY libgsf-buildsize     "14 MB (with tests)">
-  <!ENTITY libgsf-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libgsf" xreflabel="libgsf-&libgsf-version;">
-  <?dbhtml filename="libgsf.html"?>
-
-
-  <title>libgsf-&libgsf-version;</title>
-
-  <indexterm zone="libgsf">
-    <primary sortas="a-libgsf">libgsf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgsf</title>
-
-    <para>
-      The <application>libgsf</application> package contains a library
-      used for providing an extensible input/output abstraction layer for
-      structured file formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgsf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgsf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgsf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgsf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgsf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgsf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgsf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gdk-pixbuf"/>
-      (To build <command>gsf-office-thumbnailer</command>)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgsf</title>
-
-    <para>
-      Install <application>libgsf</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>
-          gsf, gsf-office-thumbnailer, and gsf-vba-dump
-        </seg>
-        <seg>
-          libgsf-1.so
-        </seg>
-        <seg>
-          /usr/include/libgsf-1,
-          /usr/share/gtk-doc/html/gsf and
-          /usr/share/thumbnailers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gsf">
-        <term><command>gsf</command></term>
-        <listitem>
-          <para>
-            is a simple archive utility, somewhat similar to
-            <ulink role='man' url='&man;tar.1'>tar(1)</ulink>
-          </para>
-          <indexterm zone="libgsf gsf">
-            <primary sortas="b-gsf">gsf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsf-office-thumbnailer">
-        <term><command>gsf-office-thumbnailer</command></term>
-        <listitem>
-          <para>
-            is used internally by <application>GNOME</application> applications
-            such as <application>Nautilus</application> to generate
-            thumbnails of several types of office application files
-          </para>
-          <indexterm zone="libgsf gsf-office-thumbnailer">
-            <primary sortas="b-gsf-office-thumbnailer">gsf-office-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gsf-vba-dump">
-        <term><command>gsf-vba-dump</command></term>
-        <listitem>
-          <para>
-            is used to extract Visual Basic for Applications macros from files
-          </para>
-          <indexterm zone="libgsf gsf-vba-dump">
-            <primary sortas="b-gsf-vba-dump">gsf-vba-dump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgsf-1">
-        <term><filename class="libraryfile">libgsf-1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libgsf</application> API functions
-          </para>
-          <indexterm zone="libgsf libgsf-1">
-            <primary sortas="c-libgsf-1">libgsf-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgudev.xml
===================================================================
--- general/genlib/libgudev.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,175 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libgudev-download-http
-           "&gnome-download-http;/libgudev/&libgudev-version;/libgudev-&libgudev-version;.tar.xz">
-  <!ENTITY libgudev-download-ftp  " ">
-  <!ENTITY libgudev-md5sum        "46da30a1c69101c3a13fa660d9ab7b73">
-  <!ENTITY libgudev-size          "32 KB">
-  <!ENTITY libgudev-buildsize     "2.0 MB">
-  <!ENTITY libgudev-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libgudev" xreflabel="libgudev-&libgudev-version;">
-  <?dbhtml filename="libgudev.html"?>
-
-
-  <title>libgudev-&libgudev-version;</title>
-
-  <indexterm zone="libgudev">
-    <primary sortas="a-libgudev">libgudev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgudev</title>
-
-    <para>
-      The <application>libgudev</application> package contains
-      GObject bindings for libudev.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgudev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgudev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgudev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgudev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgudev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgudev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="umockdev"/> (for testing)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgudev</title>
-
-    <para>
-      Install <application>libgudev</application> by running
-      the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this option if GTK-Doc is installed
-      and you wish to build and install the API documentation.
-    </para>
-
-    <!--<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../xincludes/gtk-doc-rebuild.xml"/>-->
-
-<!-- With meson, the tests will be disabled automatically without umockdev present.
-    <para>
-      <parameter>- -disable-umockdev</parameter>: Disables the usage of
-      <xref role="nodep" linkend="umockdev"/>. Omit this switch if you
-      wish to run the test suite.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libgudev-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gudev-1.0 and
-          /usr/share/gtk-doc/html/gudev
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgudev-1.0">
-        <term><filename class="libraryfile">libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is a GObject-based wrapper library for libudev
-          </para>
-          <indexterm zone="libgudev libgudev-1.0">
-            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libgusb.xml
===================================================================
--- general/genlib/libgusb.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,200 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "https://github.com/hughsie/libgusb/releases/download/&libgusb-version;/libgusb-&libgusb-version;.tar.xz">
-  <!ENTITY libgusb-download-ftp  " ">
-  <!ENTITY libgusb-md5sum        "edc0715ded0b886c063189deef94c754">
-  <!ENTITY libgusb-size          "52 KB">
-  <!ENTITY libgusb-buildsize     "2.1 MB (with tests and docs)">
-  <!ENTITY libgusb-time          "0.1 SBU (with tests and docs)">
-]>
-
-<sect1 id="libgusb" xreflabel="libgusb-&libgusb-version;">
-  <?dbhtml filename="libgusb.html"?>
-
-
-  <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>
-
-    &lfs121_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="json-glib"/> and
-      <xref linkend="libusb"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &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="gi-docgen"/> and
-      <xref linkend="umockdev"/> (for full test coverage)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgusb</title>
-
-    <para>
-      Install <application>libgusb</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Ddocs=false        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed -E "/output|install_dir/s/('libgusb)'/\1-&libgusb-version;'/" \
-    -i ../docs/meson.build                            &amp;&amp;
-meson configure -Ddocs=true                           &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: &gi-doc-disable;
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gusbcmd
-        </seg>
-        <seg>
-          libgusb.so
-        </seg>
-        <seg>
-          /usr/include/gusb-1 and
-          /usr/share/doc/libgusb-&libgusb-version; (if gi-docgen is used)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gusbcmd">
-        <term><command>gusbcmd</command></term>
-        <listitem>
-          <para>
-            is a debugging tool for the libgusb library
-          </para>
-          <indexterm zone="libgusb gusbcmd">
-            <primary sortas="b-gusbcmd">gusbcmd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <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/libical.xml
===================================================================
--- general/genlib/libical.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,325 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libical-download-http "https://github.com/libical/libical/releases/download/v&libical-version;/libical-&libical-version;.tar.gz">
-  <!ENTITY libical-download-ftp  " ">
-  <!ENTITY libical-md5sum        "cc790ea49701df0335d42b89d57c04bc">
-  <!ENTITY libical-size          "888 KB">
-  <!ENTITY libical-buildsize     "24 MB (with tests)">
-  <!ENTITY libical-time          "0.1 SBU (iusing parallelism=4; with tests)">
-<!-- run at -j1 because it fails at -j4 -->
-]>
-
-<sect1 id="libical" xreflabel="libical-&libical-version;">
-  <?dbhtml filename="libical.html"?>
-
-
-  <title>libical-&libical-version;</title>
-
-  <indexterm zone="libical">
-    <primary sortas="a-libical">libical</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libical</title>
-
-    <para>
-      The <application>libical</application> package contains an implementation
-      of the iCalendar protocols and data formats.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libical-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libical-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libical-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libical-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libical-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libical-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libical Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="vala"/> (both required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for the API documentation),
-      <xref linkend="graphviz"/> (for the API documentation),
-      <xref linkend="gtk-doc"/> (for the API documentation),
-      <xref linkend="icu"/>, 
-      <xref linkend="pygobject3"/> (for some tests), and
-      &berkeley-db;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libical</title>
-
-    <para>
-      Install <application>libical</application> by running the
-      following commands:
-    </para>
-
-  <!-- Needs confirmation, but I got a race condition at -j8,
-  -j1 allowed the build to pass. Pierre 2019-12-06
-  I always have it actually. Hence the entity.
-
-  Works at -j8 and -j4 for version 3.0.18
-    &parallel_issues;-->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=/usr  \
-      -D CMAKE_BUILD_TYPE=Release   \
-      -D SHARED_ONLY=yes            \
-      -D ICAL_BUILD_DOCS=false      \
-      -D ICAL_BUILD_EXAMPLES=false  \
-      -D GOBJECT_INTROSPECTION=true \
-      -D ICAL_GLIB_VAPI=true        \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/>, <xref linkend="graphviz"/>,
-      and <xref linkend="gtk-doc"/>
-      installed and wish to build the API documentation,  you should
-      remove the <parameter>-DICAL_BUILD_DOCS=false</parameter> switch
-      and issue:
-    </para>
-
-<screen remap="doc"><userinput>make docs</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test</command>.
-      <!-- One test, timezones, is known to fail on SysV systems. -->
-      <!-- On systemd, we symlink the current timezone to
-           /etc/localtime, which is what libical expects.
-           This is now done on SysV as well.-->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you have built the API documentation, install by issuing, as
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -vdm755 /usr/share/doc/libical-&libical-version;/html &amp;&amp;
-cp -vr apidocs/html/* /usr/share/doc/libical-&libical-version;/html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-D CMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-D SHARED_ONLY=yes</parameter>: This switch is used
-      in order to only build the shared libraries.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_BUILD_DOCS=false</parameter>: This switch prevents
-      building the <application>GTK</application> documentation. Remove
-      if you want to build the documentation.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_BUILD_EXAMPLES=false</parameter>: This switch prevents
-      building examples. Remove if you want to build them.
-    </para>
-
-    <para>
-      <parameter>-D GOBJECT_INTROSPECTION=true</parameter>: This switch is used
-      to generate GObject metadata bindings.
-    </para>
-
-    <para>
-      <parameter>-D ICAL_GLIB_VAPI=true</parameter>: This switch is used
-      in order to build bindings for <xref linkend="vala"/>.
-    </para>
-
-    <para>
-      <option>-D USE_BUILTIN_TZDATA=yes</option>: This switch is used
-      in order to build using your own timezone data.
-    </para>
-
-    <!-- No CMake equivalents
-    <para>
-      <parameter>- -enable-cxx</parameter>: This switch enables
-      <application>libical</application> C++ library.
-    </para>
-
-    <para>
-      <option>- -enable-python</option>: This switch enables
-      <application>libical</application> Python bindings.
-    </para> -->
-
-  </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>
-          libical_cxx.so,
-          libical.so,
-          libical-glib.so,
-          libicalss_cxx.so,
-          libicalss.so,
-          and libicalvcal.so
-        </seg>
-        <seg>
-          /usr/include/libical,
-          /usr/include/libical-glib,
-          /usr/lib/cmake/LibIcal,
-          /usr/libexec/libical,
-          /usr/share/gtk-doc/html/libical-glib (optional),
-          and /usr/share/doc/libical-&libical-version;/html
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libical-lib">
-        <term><filename class="libraryfile">libical.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> API
-            functions
-          </para>
-          <indexterm zone="libical libical-lib">
-            <primary sortas="c-libical">libical.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libical_cxx-lib">
-        <term><filename class="libraryfile">libical_cxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> C++ bindings
-          </para>
-          <indexterm zone="libical libical_cxx-lib">
-            <primary sortas="c-libical_cxx">libical_cxx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libical-glib">
-        <term><filename class="libraryfile">libical-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libical</application> glib bindings
-          </para>
-          <indexterm zone="libical libical-glib">
-            <primary sortas="c-libical-glib">libical-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalss">
-        <term><filename class="libraryfile">libicalss.so</filename></term>
-        <listitem>
-          <para>
-            is a library that allows you to store iCal component data
-            to disk in a variety of ways
-          </para>
-          <indexterm zone="libical libicalss">
-            <primary sortas="c-libicalss">libicalss.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalss_cxx">
-        <term><filename class="libraryfile">libicalss_cxx.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libicalss</application> C++
-            bindings
-          </para>
-          <indexterm zone="libical libicalss_cxx">
-            <primary sortas="c-libicalss_cxx">libicalss_cxx.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libicalvcal">
-        <term><filename class="libraryfile">libicalvcal.so</filename></term>
-        <listitem>
-          <para>
-            is a vCard/vCalendar C interface
-          </para>
-          <indexterm zone="libical libicalvcal">
-            <primary sortas="c-libicalvcal">libicalvcal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libidn.xml
===================================================================
--- general/genlib/libidn.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,205 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libidn-download-http "&gnu-http;/libidn/libidn-&libidn-version;.tar.gz">
-  <!ENTITY libidn-download-ftp  " ">
-  <!ENTITY libidn-md5sum        "fe061a95ae23979150a692d102dce4ad">
-  <!ENTITY libidn-size          "2.5 MB">
-  <!ENTITY libidn-buildsize     "19 MB (with tests)">
-  <!ENTITY libidn-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libidn" xreflabel="libidn-&libidn-version;">
-  <?dbhtml filename="libidn.html"?>
-
-
-  <title>libidn-&libidn-version;</title>
-
-  <indexterm zone="libidn">
-    <primary sortas="a-libidn">libidn</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libidn</title>
-
-    <para>
-      <application>libidn</application> is a package designed for
-      internationalized string handling based on the
-      <ulink url="https://www.ietf.org/rfc/rfc3454.txt">Stringprep</ulink>,
-      <ulink url="https://www.ietf.org/rfc/rfc3492.txt">Punycode</ulink> and
-      <ulink url="https://www.ietf.org/rfc/rfc3490.txt">IDNA</ulink>
-      specifications defined by the Internet Engineering Task Force
-      (IETF) Internationalized Domain Names (IDN) working group, used for
-      internationalized domain names. This is useful for converting data from the
-      system's native representation into UTF-8, transforming Unicode strings
-      into ASCII strings, allowing applications to use certain ASCII name labels
-      (beginning with a special prefix) to represent non-ASCII name labels, and
-      converting entire domain names to and from the ASCII Compatible Encoding
-      (ACE) form.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libidn-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libidn-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libidn-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libidn-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libidn-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libidn-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libidn Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="emacs"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="openjdk"/>,
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://www.mono-project.com/">Mono</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libidn</title>
-
-    <para>
-      Install <application>libidn</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, run:
-    </para>
-
-<screen remap="test"><userinput>pushd tests  &amp;&amp;
-  make check &amp;&amp;
-popd </userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-
-find doc -name "Makefile*" -delete            &amp;&amp;
-rm -rf -v doc/{gdoc,idn.1,stamp-vti,man,texi} &amp;&amp;
-mkdir -v       /usr/share/doc/libidn-&libidn-version;     &amp;&amp;
-cp -r -v doc/* /usr/share/doc/libidn-&libidn-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"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-    <para>
-      <option>--enable-java</option>: Use this switch to enable building
-      the Java implementation of <application>libidn</application>. Note that
-      <xref linkend="openjdk"/> must be installed to use this option.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          idn
-        </seg>
-        <seg>
-          libidn.so
-        </seg>
-        <seg>
-          /usr/share/doc/libidn-&libidn-version; and
-          /usr/share/gtk-doc/html/libidn
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="idn">
-        <term><command>idn</command></term>
-        <listitem>
-          <para>
-            is a command line interface to the internationalized domain
-            name library
-          </para>
-          <indexterm zone="libidn idn">
-            <primary sortas="b-idn">idn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libidn-lib">
-        <term><filename class="libraryfile">libidn.so</filename></term>
-        <listitem>
-          <para>
-            contains a generic Stringprep implementation that does Unicode
-            3.2 NFKC normalization, mapping and prohibition of characters, and
-            bidirectional character handling. Profiles for Nameprep, iSCSI, SASL
-            and XMPP are included as well as support for Punycode and ASCII
-            Compatible Encoding (ACE) via IDNA. A mechanism to define Top-Level
-            Domain (TLD) specific validation tables, and to compare strings
-            against those tables, as well as default tables for some TLDs are
-            included
-          </para>
-          <indexterm zone="libidn libidn-lib">
-            <primary sortas="c-libidn">libidn.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libidn2.xml
===================================================================
--- general/genlib/libidn2.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,179 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libidn2-download-http "&gnu-http;/libidn/libidn2-&libidn2-version;.tar.gz">
-  <!ENTITY libidn2-download-ftp  " ">
-  <!ENTITY libidn2-md5sum        "de2818c7dea718a4f264f463f595596b">
-  <!ENTITY libidn2-size          "2.1 MB">
-  <!ENTITY libidn2-buildsize     "21 MB (add 3 MB for tests)">
-  <!ENTITY libidn2-time          "0.1 SBU (add 0.6 SBU for tests)">
-]>
-
-<!-- Try to keep the indentation used in this file-->
-<sect1 id="libidn2" xreflabel="libidn2-&libidn2-version;">
-  <?dbhtml filename="libidn2.html"?>
-
-
-  <title>libidn2-&libidn2-version;</title>
-
-  <indexterm zone="libidn2">
-    <primary sortas="a-libidn2">libidn2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libidn2</title>
-
-    <para>
-      <application>libidn2</application> is a package designed for
-      internationalized string handling based on standards from the
-      Internet Engineering Task Force (IETF)'s IDN working group, designed for
-      internationalized domain names.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libidn2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libidn2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libidn2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libidn2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libidn2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libidn2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libidn2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libunistring"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="git"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="installation">
-    <title>Installation of libidn2</title>
-
-    <para>
-      Install <application>libidn2</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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          idn2
-        </seg>
-        <seg>
-          libidn2.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/libidn2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <!-- If the program or library name conflicts (is the same) as the
-      package name, add -prog or -lib to the varlistentry entity id
-      and the 2nd entry of the indexterm zone entity -->
-
-      <varlistentry id="idn2">
-        <term><command>idn2</command></term>
-        <listitem>
-          <para>
-            is a command line interface to the internationalized domain
-            library
-          </para>
-          <indexterm zone="libidn2 idn2">
-            <primary sortas="b-idn2">idn2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libidn2-lib">
-        <term><filename class="libraryfile">libidn2.so</filename></term>
-        <listitem>
-          <para>
-            contains a generic Stringprep implementation used for
-            internationalized string handling
-          </para>
-          <indexterm zone="libidn2 libidn2-lib">
-            <primary sortas="c-libidn2">libidn2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libiodbc.xml
===================================================================
--- general/genlib/libiodbc.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,193 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libiodbc-download-http "&sourceforge-dl;/iodbc/libiodbc-&libiodbc-version;.tar.gz">
-  <!ENTITY libiodbc-download-ftp  " ">
-  <!ENTITY libiodbc-md5sum        "89949a41e542bb1b880d7fcc4987dad2">
-  <!ENTITY libiodbc-size          "1.0 MB">
-  <!ENTITY libiodbc-buildsize     "26 MB">
-  <!ENTITY libiodbc-time          "0.2 SBU">
-]>
-
-<sect1 id="libiodbc" xreflabel="libiodbc-&libiodbc-version;">
-  <?dbhtml filename="libiodbc.html"?>
-
-
-  <title>libiodbc-&libiodbc-version;</title>
-
-  <indexterm zone="libiodbc">
-    <primary sortas="a-libiodbc">libiodbc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libiodbc</title>
-
-    <para>
-      <application>libiodbc</application> is an API to ODBC compatible
-      databases.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libiodbc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libiodbc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libiodbc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libiodbc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libiodbc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libiodbc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libiodbc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk2"/> (to create the GUI admin tool)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libiodbc</title>
-
-    <para>
-      Install <application>libiodbc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                   \
-            --with-iodbc-inidir=/etc/iodbc  \
-            --includedir=/usr/include/iodbc \
-            --disable-libodbc               \
-            --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>
-
-    <para>
-      <parameter>--with-iodbc-inidir=/etc/iodbc</parameter>:
-      <application>libiodbc</application> will install configuration files
-      in this directory.
-    </para>
-
-    <para>
-      <parameter>--includedir=/usr/include/iodbc</parameter>: This installs the
-      interface headers to a private directory to avoid a conflict with headers
-      installed by <application>unixODBC</application>.
-    </para>
-
-    <para>
-      <parameter>--disable-libodbc</parameter>: This prevents the installation
-      of the <filename class="symlink">libodbc.so</filename> symbolic link to
-      avoid a conflict with <application>unixODBC</application>.
-    </para>
-
-    <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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>iodbc-config, iodbctest, iodbctestw, and iodbcadm-gtk</seg>
-        <seg>libdrvproxy.so, libiodbc.so, libiodbcinst.so, and
-        libiodbcadm.so</seg>
-        <seg>/usr/include/iodbc, /usr/share/libiodbc, and /etc/iodbc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="iodbc-config">
-        <term><command>iodbc-config</command></term>
-        <listitem>
-          <para>
-            is a utility for retrieving the installation options of libiodbc
-          </para>
-          <indexterm zone="libiodbc iodbc-config">
-            <primary sortas="b-iodbc-config">iodbc-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbctest">
-        <term><command>iodbctest{,w}</command></term>
-        <listitem>
-          <para>
-            are interactive SQL processors
-          </para>
-          <indexterm zone="libiodbc iodbctest">
-            <primary sortas="b-iodbctest">iodbctest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iodbcadm">
-        <term><command>iodbcadm-gtk</command></term>
-        <listitem>
-          <para>
-            is a graphical administration utility
-          </para>
-          <indexterm zone="libiodbc iodbcadm">
-            <primary sortas="b-iodbcadm">iodbcadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libksba.xml
===================================================================
--- general/genlib/libksba.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,189 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libksba-download-http "&gnupg-http;/libksba/libksba-&libksba-version;.tar.bz2">
-  <!ENTITY libksba-download-ftp  " ">
-  <!ENTITY libksba-md5sum        "b84be832461d4704c227c3719288bfc9">
-  <!ENTITY libksba-size          "692 KB">
-  <!ENTITY libksba-buildsize     "9.4 MB (with tests)">
-  <!ENTITY libksba-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libksba" xreflabel="libksba-&libksba-version;">
-  <?dbhtml filename="libksba.html"?>
-
-
-  <title>libksba-&libksba-version;</title>
-
-  <indexterm zone="libksba">
-    <primary sortas="a-libksba">libksba</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libksba</title>
-
-    <para>
-      The <application>Libksba</application> package contains a library
-      used to make X.509 certificates as well as making the CMS (Cryptographic
-      Message Syntax) easily accessible by other applications. Both
-      specifications are building blocks of S/MIME and TLS. The library does
-      not rely on another cryptographic library but provides hooks for easy
-      integration with <application>Libgcrypt</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libksba-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libksba-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libksba-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libksba-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libksba-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libksba-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Libksba 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="valgrind"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libksba</title>
-
-    <para>
-      Install <application>Libksba</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen><!-- &amp;&amp;
-
-makeinfo - -html - -no-split -o doc/ksba_nochunks.html doc/ksba.texi &amp;&amp;
-makeinfo - -plaintext       -o doc/ksba.txt           doc/ksba.texi</userinput></screen>
-
-    <para>
-      If you wish to build alternate formats of the documentation, you
-      must have <xref linkend="texlive"/> installed,
-      then issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>make -C doc ps pdf html</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><!-- &amp;&amp;
-
-install -v -m755 -d /usr/share/doc/libksba-&libksba-version; &amp;&amp;
-install -v -m644    README doc/ksba{_nochunks.html,.txt,.texi} \
-                    /usr/share/doc/libksba-&libksba-version;</userinput></screen>
-
-    <para>
-      If you built the additional documentation, install it by issuing the
-      following commands as the <systemitem class="username">root</systemitem>
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
-install -v -m644 doc/ksba.html/* \
-                    /usr/share/doc/libksba-&libksba-version;/html &amp;&amp;
-install -v -m644 doc/ksba.{pdf,ps,dvi} \
-                    /usr/share/doc/libksba-&libksba-version;</userinput></screen> -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg><!--ksba-config not in 1.6.3-->None</seg>
-        <seg>libksba.so</seg>
-        <seg>None<!--/usr/share/doc/libksba-&libksba-version;--></seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-      <!--
-      <varlistentry id="ksba-config">
-        <term><command>ksba-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            the libksba(3) 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 libksba(3) library
-          </para>
-          <indexterm zone="libksba ksba-config">
-            <primary sortas="b-ksba-config">ksba-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-      <varlistentry id="libksba-lib">
-        <term><filename class="libraryfile">libksba.{so,a}</filename></term>
-        <listitem>
-          <para>
-            contains the cryptographic API functions
-          </para>
-          <indexterm zone="libksba libksba-lib">
-            <primary sortas="c-libksba">libksba.{so,a}</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/liblinear.xml
===================================================================
--- general/genlib/liblinear.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liblinear-download-http "https://github.com/cjlin1/liblinear/archive/v&liblinear-version;/liblinear-&liblinear-version;.tar.gz">
-  <!ENTITY liblinear-download-ftp  " ">
-  <!ENTITY liblinear-md5sum        "0c81dd2b2cabc4fba85f61b9dc51c4a3">
-  <!ENTITY liblinear-size          "560 KB">
-  <!ENTITY liblinear-buildsize     "1.6 MB">
-  <!ENTITY liblinear-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="liblinear" xreflabel="liblinear-&liblinear-version;">
-  <?dbhtml filename="liblinear.html"?>
-
-
-  <title>liblinear-&liblinear-version;</title>
-
-  <indexterm zone="liblinear">
-    <primary sortas="a-liblinear">liblinear</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liblinear</title>
-
-    <para>
-      This package provides a library for learning linear classifiers for large
-      scale applications. It supports Support Vector Machines (SVM) with L2 and
-      L1 loss, logistic regression, multi class classification and also Linear
-      Programming Machines (L1-regularized SVMs). Its computational complexity
-      scales linearly with the number of training examples making it one of the
-      fastest SVM solvers around.
-    </para>
-
-    &lfs121_checked;
-
-    <note>
-      <para>
-        After updating this package from
-        <application>liblinear-1.96</application> or earlier, you need to
-        reinstall <xref linkend="nmap"/>, in order to link to the new library.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liblinear-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liblinear-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liblinear-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liblinear-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liblinear-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liblinear-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liblinear</title>
-
-    <para>
-      Install <application>liblinear</application> by running the following commands:
-    </para>
-
-<screen><userinput>make lib</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>install -vm644 linear.h /usr/include &amp;&amp;
-install -vm755 liblinear.so.5 /usr/lib &amp;&amp;
-ln -sfv liblinear.so.5 /usr/lib/liblinear.so</userinput></screen>
-  </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>
-          liblinear.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblinear-lib">
-        <term><filename class="libraryfile">liblinear.so</filename></term>
-        <listitem>
-          <para>
-            is a large linear classification library
-          </para>
-          <indexterm zone="liblinear liblinear-lib">
-            <primary sortas="c-liblinear">liblinear.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libmbim.xml
===================================================================
--- general/genlib/libmbim.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libmbim-download-http "https://www.freedesktop.org/software/libmbim/libmbim-&libmbim-version;.tar.xz">
-  <!ENTITY libmbim-download-ftp  " ">
-  <!ENTITY libmbim-md5sum        "58dea20cad346f31d2873b68385a9973">
-  <!ENTITY libmbim-size          "553 KB">
-  <!ENTITY libmbim-buildsize     "33 MB (with tests)">
-  <!ENTITY libmbim-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libmbim" xreflabel="libmbim-&libmbim-version;">
-  <?dbhtml filename="libmbim.html"?>
-
-
-  <title>libmbim-&libmbim-version;</title>
-
-  <indexterm zone="libmbim">
-    <primary sortas="a-libmbim">libmbim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libmbim</title>
-
-    <para>
-      The <application>libmbim</application> package contains a GLib-based library
-      for talking to WWAN modems and devices which speak the Mobile Interface
-      Broadband Model (MBIM) protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libmbim-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libmbim-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libmbim-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libmbim-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libmbim-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libmbim-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libmbim Dependencies</bridgehead>
-
-    <!-- not needed anymore with 1.26.0
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>
-    </para>
-    -->
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libmbim</title>
-
-    <para>
-      Install <application>libmbim</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 Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mbimcli and mbim-network
-        </seg>
-        <seg>
-          libmbim-glib.so
-        </seg>
-        <seg>
-          /usr/include/libmbim-glib and
-          /usr/share/gtk-doc/html/libmbim-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mbimcli">
-        <term><command>mbimcli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control MBIM devices
-          </para>
-          <indexterm zone="libmbim mbimcli">
-            <primary sortas="b-mbimcli">mbimcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbim-network">
-        <term><command>mbim-network</command></term>
-        <listitem>
-          <para>
-            is an utility used for simple network management
-            of MBIM devices
-          </para>
-          <indexterm zone="libmbim mbim-network">
-            <primary sortas="b-mbim-network">mbim-network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmbim-glib">
-        <term><filename class="libraryfile">libmbim-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for talking to WWAN modems and devices
-            which speak the Mobile Interface Broadband Model (MBIM)
-            protocol
-          </para>
-          <indexterm zone="libmbim libmbim-glib">
-            <primary sortas="c-libmbim-glib">libmbim-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libnvme.xml
===================================================================
--- general/genlib/libnvme.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libnvme-download-http "https://github.com/linux-nvme/libnvme/archive/v&libnvme-version;/libnvme-&libnvme-version;.tar.gz">
-  <!ENTITY libnvme-download-ftp  " ">
-  <!ENTITY libnvme-md5sum        "ff72b83dc2ada1da0bd528570154eed3">
-  <!ENTITY libnvme-size          "616 KB">
-  <!ENTITY libnvme-buildsize     "13 MB">
-  <!ENTITY libnvme-time          "0.1 SBU (including tests)">
-]>
-
-<sect1 id="libnvme" xreflabel="libnvme-&libnvme-version;">
-  <?dbhtml filename="libnvme.html"?>
-
-  <title>libnvme-&libnvme-version;</title>
-
-  <indexterm zone="libnvme">
-    <primary sortas="a-libnvme">libnvme</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnvme</title>
-
-    <para>
-      The <application>libnvme</application> package is a library which
-      provides type definitions for NVMe specification structures,
-      enumerations, and bit fields, helper functions to construct, dispatch,
-      and decode commands and payloads, and utilities to connect, scan, and
-      manage NVMe devices on a Linux system.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnvme-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnvme-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnvme-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnvme-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnvme-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnvme-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-   <bridgehead renderas="sect3">libnvme Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="sysv"><xref linkend="dbus"/>,</phrase>
-      <xref linkend="json-c"/>,
-      <xref linkend="keyutils"/>, and
-      <xref linkend="swig"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnvme</title>
-
-    <para>
-      Install <application>libnvme</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dlibdbus=auto .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </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>
-          libnvme.so and
-          libnvme-mi.so
-        </seg>
-        <seg>
-          /usr/include/nvme and
-          /usr/lib/python3.11/site-packages/libnvme
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libnvme-lib">
-        <term><filename class="libraryfile">libnvme.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to handle operations
-            relating to NVMe devices.
-          </para>
-          <indexterm zone="libnvme libnvme-lib">
-            <primary sortas="c-libnvme">libnvme.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libpaper.xml
===================================================================
--- general/genlib/libpaper.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,212 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libpaper-download-http "https://github.com/rrthomas/libpaper/releases/download/v&libpaper-version;/libpaper-&libpaper-version;.tar.gz">
-  <!ENTITY libpaper-download-ftp  " ">
-  <!ENTITY libpaper-md5sum        "4b914c3ca6d8277260fce418e12bae6b">
-  <!ENTITY libpaper-size          "1.1 MB">
-  <!ENTITY libpaper-buildsize     "11 MB (with tests)">
-  <!ENTITY libpaper-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libpaper" xreflabel="libpaper-&libpaper-version;">
-  <?dbhtml filename="libpaper.html"?>
-
-
-  <title>libpaper-&libpaper-version;</title>
-
-  <indexterm zone="libpaper">
-    <primary sortas="a-libpaper">libpaper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libpaper</title>
-
-    <para>
-      This package is intended to provide a simple way for applications to take
-      actions based on a system or user-specified paper size.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libpaper-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libpaper-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libpaper-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libpaper-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libpaper-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libpaper-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libpaper</title>
-
-    <para>
-      Install <application>libpaper</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr        \
-            --sysconfdir=/etc    \
-            --disable-static     \
-            --enable-relocatable \
-            --docdir=/usr/share/doc/libpaper-&libpaper-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the &root; 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"/>
-
-    <para>
-      <parameter>--enable-relocatable</parameter>:
-      This switch is needed to run the tests.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring libpaper</title>
-
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The paper size is automatically determined from the system locale;
-        see <literal>LC_PAPER</literal> in <ulink role='man'
-        url='&man;locale.7'>locale(7)</ulink>.
-        If you want to override it, create a <filename>papersize</filename>
-        file in the user configuration directory.  For example:
-      </para>
-
-<screen role="nodump"><userinput>mkdir -pv ~/.config &amp;&amp;
-echo "a4" &gt; ~/.config/papersize</userinput></screen>
-
-      <para>
-        If you want to override the paper size globally (for all users),
-        set up the <envar>PAPERSIZE</envar> environment variable.  For
-        example:
-      </para>
-
-<screen role="nodump"><userinput>echo "PAPERSIZE=a4" &gt; /etc/profile.d/libpaper.sh</userinput></screen>
-
-      <para>
-        You may use a different paper size, such as
-        <quote><literal>letter</literal></quote>.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          paper and
-          paperconf
-        </seg>
-        <seg>
-          libpaper.so
-        </seg>
-        <seg>
-          /usr/share/doc/libpaper-&libpaper-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="paper">
-        <term><command>paper</command></term>
-        <listitem>
-          <para>
-            prints paper configuration information
-          </para>
-          <indexterm zone="libpaper paper">
-            <primary sortas="b-paper">paper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paperconf">
-        <term><command>paperconf</command></term>
-        <listitem>
-          <para>
-            prints paper configuration information in a compatibility mode
-          </para>
-          <indexterm zone="libpaper paperconf">
-            <primary sortas="b-paperconf">paperconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpaper-lib">
-        <term><filename class="libraryfile">libpaper.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for interrogating the paper library
-          </para>
-          <indexterm zone="libpaper libpaper-lib">
-            <primary sortas="c-libpaper">libpaper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libportal.xml
===================================================================
--- general/genlib/libportal.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,276 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libportal-download-http "https://github.com/flatpak/libportal/releases/download/&libportal-version;/libportal-&libportal-version;.tar.xz">
-  <!ENTITY libportal-download-ftp  " ">
-  <!ENTITY libportal-md5sum        "f94be41e8495ae7d6aaed046481daa61">
-  <!ENTITY libportal-size          "76 KB">
-  <!ENTITY libportal-buildsize     "3.0 MB (with tests)">
-  <!ENTITY libportal-time          "0.1 SBU (add 0.3 SBU for tests)">
-]>
-
-<sect1 id="libportal" xreflabel="libportal-&libportal-version;">
-  <?dbhtml filename="libportal.html"?>
-
-
-  <title>libportal-&libportal-version;</title>
-
-  <indexterm zone="libportal">
-    <primary sortas="a-libportal">libportal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libportal</title>
-
-    <para>
-      The <application>libportal</application> package provides
-      a library that contains GIO-style async APIs for most Flatpak portals.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libportal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libportal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libportal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libportal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libportal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libportal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional patch (required for running the test suite):
-          <ulink url="&patch-root;/libportal-&libportal-version;-testsuite_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libportal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gtk3"/> and
-      <xref linkend="gtk4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="runtime">
-      To make this package really useful, install
-      <xref linkend="xdg-desktop-portal"/>,
-      <xref linkend="xdg-desktop-portal-gtk"/>,
-      <xref role="nodep" linkend="xdg-desktop-portal-gnome"/> (if running
-      a GNOME desktop environment), and
-      <xref role="nodep" linkend="xdg-desktop-portal-lxqt"/> (if running
-      a LXQt desktop environment).  They are not needed if only using this
-      package to satisfy a build dependency.
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> (for documentation),
-      <xref linkend="python-dbusmock"/> and
-      <xref linkend="pytest"/> (for testing),
-      &qt5-deps; (for the Qt5 version of libportal), and
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libportal</title>
-
-    <warning>
-      <para>
-        If a previous version of libportal is installed, move the
-        headers out of the way so that later packages do not encounter
-        conflicts (as the <systemitem role="username">root</systemitem>
-        user):
-      </para>
-<screen role="root"><userinput>if [ -e /usr/include/libportal ]; then
-    rm -rf /usr/include/libportal.old &amp;&amp;
-    mv -vf /usr/include/libportal{,.old}
-fi</userinput></screen>
-    </warning>
-
-    <para>
-      If running the test suite, apply a patch to fix a dozen of test
-      failures with python-dbusmock 0.30.0 or later:
-    </para>
-
-    <screen><userinput>patch -Np1 -i ../libportal-&libportal-version;-testsuite_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>libportal</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Ddocs=false .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-<screen role='nodump'><userinput>sed "/output/s/-1/-&libportal-version;/" -i ../doc/meson.build &amp;&amp;
-meson configure -Ddocs=true                    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Note that
-      additional <filename>dbus-daemon</filename> processes may need to be
-      killed after the tests are run.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: &gi-doc-disable;
-    </para>
-
-<!-- These options are now automatically detected, so it doesn't make sense to
-     explicitly set which ones are used (as of version 0.7)
-    <para>
-      <option>-Dbackends=gtk3,gtk4,qt5</option>: This switch allows you to set
-      the available backends. You can use it to disable the dependency on gtk-3,
-      gtk-4, or qt-5. Most applications that use libportal will use either
-      gtk-4 or gtk-3. The default is to build all three backends.
-    </para>
--->
-
-  </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>
-          libportal.so,
-          libportal-gtk3.so,
-          libportal-gtk4.so, and
-          libportal-qt5.so
-        </seg>
-        <seg>
-          /usr/include/libportal and
-          /usr/share/gtk-doc/html/libportal
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libportal-lib">
-        <term><filename class="libraryfile">libportal.so</filename></term>
-        <listitem>
-          <para>
-            provides GIO-style async APIs for most Flatpak portals
-          </para>
-          <indexterm zone="libportal libportal-lib">
-            <primary sortas="c-libportal">libportal.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-gtk3">
-        <term><filename class="libraryfile">libportal-gtk3.so</filename></term>
-        <listitem>
-          <para>
-            provides GTK+-3 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-gtk3">
-            <primary sortas="c-libportal-gtk3">libportal-gtk3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-gtk4">
-        <term><filename class="libraryfile">libportal-gtk4.so</filename></term>
-        <listitem>
-          <para>
-            provides GTK-4 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-gtk4">
-            <primary sortas="c-libportal-gtk4">libportal-gtk4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libportal-qt5">
-        <term><filename class="libraryfile">libportal-qt5.so</filename></term>
-        <listitem>
-          <para>
-            provides Qt5 specific functions for interacting with Flatpak
-            portals
-          </para>
-          <indexterm zone="libportal libportal-qt5">
-            <primary sortas="c-libportal-qt5">libportal-qt5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libptytty.xml
===================================================================
--- general/genlib/libptytty.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libptytty-download-http "http://dist.schmorp.de/libptytty/libptytty-&libptytty-version;.tar.gz">
-  <!ENTITY libptytty-download-ftp  " ">
-  <!ENTITY libptytty-md5sum        "2a7f3f3c0d3ef71902da745dc7959529">
-  <!ENTITY libptytty-size          "48 KB">
-  <!ENTITY libptytty-buildsize     "1.4 MB">
-  <!ENTITY libptytty-time          "less than 0.1 SBU">
-
-]>
-
-<sect1 id="libptytty" xreflabel="libptytty-&libptytty-version;">
-  <?dbhtml filename="libptytty.html"?>
-
-
-  <title>libptytty-&libptytty-version;</title>
-
-  <indexterm zone="libptytty">
-    <primary sortas="a-libptytty">libptytty</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libptytty</title>
-
-    <para>
-      The <application>libptytty</application> package provides a library that
-      allows for OS independent and secure pty/tty and utmp/wtmp/lastlog
-      handling.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libptytty-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libptytty-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libptytty-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libptytty-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libptytty-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libptytty-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libptytty Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libptytty</title>
-
-    <para>
-      Install <application>libptytty</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-      -DCMAKE_BUILD_TYPE=Release      \
-      -DPT_UTMP_FILE:STRING=/run/utmp \
-      .. &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>
-          libptytty.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libptytty-lib">
-        <term><filename class="libraryfile">libptytty.so</filename></term>
-        <listitem>
-          <para>
-            provides for OS independent and secure pty/tty and utmp/wtmp/lastlog handling
-          </para>
-          <indexterm zone="libptytty libptytty-lib">
-            <primary sortas="c-libptytty">libptytty.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libqalculate.xml
===================================================================
--- general/genlib/libqalculate.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,177 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libqalculate-download-http "https://github.com/Qalculate/libqalculate/releases/download/v&libqalculate-version;/libqalculate-&libqalculate-version;.tar.gz">
-  <!ENTITY libqalculate-download-ftp  " ">
-  <!ENTITY libqalculate-md5sum        "7283e883d79287a57d635bd9ff9a9932">
-  <!ENTITY libqalculate-size          "2.6 MB">
-  <!ENTITY libqalculate-buildsize     "150 MB (with tests)">
-  <!ENTITY libqalculate-time          "0.9 SBU (With tests; both using parallelism=8)">
-]>
-
-<sect1 id="libqalculate" xreflabel="libqalculate-&libqalculate-version;">
-  <?dbhtml filename="libqalculate.html"?>
-
-  <title>libqalculate-&libqalculate-version;</title>
-
-  <indexterm zone="libqalculate">
-    <primary sortas="a-libqalculate">libqalculate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqalculate</title>
-
-    <para>
-      The <application>libqalculate</application> package contains a library
-      that provides functions for a multi-purpose calculator.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqalculate-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqalculate-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqalculate-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqalculate-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqalculate-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqalculate-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqalculate Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="curl"/>,
-      <xref linkend="icu"/>, and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <ulink url="http://www.gnuplot.info/download.html">gnuplot</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqalculate</title>
-
-    <para>
-      Install <application>libqalculate</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libqalculate-&libqalculate-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/rm-la-file-referring-icu.xml"/>
-
-<screen role="root"><userinput>rm -v /usr/lib/libqalculate.la</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>
-          qalc
-        </seg>
-        <seg>
-          libqalculate.so
-        </seg>
-        <seg>
-          /usr/include/libqalculate,
-          /usr/share/doc/libqalculate-&libqalculate-version;, and
-          /usr/share/qalculate
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qalc">
-        <term><command>qalc</command></term>
-        <listitem>
-          <para>
-            is a powerful and easy to use command line calculator
-          </para>
-          <indexterm zone="libqalculate qalc">
-            <primary sortas="b-qalc">qalc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqalculate.so">
-        <term><filename class="libraryfile">libqalculate.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libqalculate</application> API functions
-          </para>
-          <indexterm zone="libqalculate libqalculate.so">
-            <primary sortas="c-libqalculate">libqalculate.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libqmi.xml
===================================================================
--- general/genlib/libqmi.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,216 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libqmi-download-http "https://www.freedesktop.org/software/libqmi/libqmi-&libqmi-version;.tar.xz">
-  <!ENTITY libqmi-download-ftp  " ">
-  <!ENTITY libqmi-md5sum        "5ec8838914f80e1dfa4d2fa8cc2f186d">
-  <!ENTITY libqmi-size          "1.2 MB">
-  <!ENTITY libqmi-buildsize     "151 MB (with tests)">
-  <!ENTITY libqmi-time          "0.3 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="libqmi" xreflabel="libqmi-&libqmi-version;">
-  <?dbhtml filename="libqmi.html"?>
-
-
-  <title>libqmi-&libqmi-version;</title>
-
-  <indexterm zone="libqmi">
-    <primary sortas="a-libqmi">libqmi</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libqmi</title>
-
-    <para>
-      The <application>libqmi</application> package contains a GLib-based library
-      for talking to WWAN modems and devices which speak the Qualcomm MSM Interface
-      (QMI) protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libqmi-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libqmi-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libqmi-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libqmi-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libqmi-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libqmi-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libqmi Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended) and
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libmbim"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>,
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man/">help2man</ulink>, and
-      <ulink url="https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib">libqrtr-glib</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libqmi</title>
-
-    <para>
-      Install <application>libqmi</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>PYTHON=python3 ./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"/>
-
-    <para>
-      <option>--disable-mbim-qmux</option>: This switch disables support for
-      using a MBIM control device for QMI messages. Use this switch if you
-      did not install <application>libmbim</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qmicli,
-          qmi-firmware-update,
-          and qmi-network
-        </seg>
-        <seg>
-          libqmi-glib.so
-        </seg>
-        <seg>
-          /usr/include/libqmi-glib and
-          /usr/share/gtk-doc/html/libqmi-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qmicli">
-        <term><command>qmicli</command></term>
-        <listitem>
-          <para>
-            is an utility used to control QMI devices
-          </para>
-          <indexterm zone="libqmi qmicli">
-            <primary sortas="b-qmicli">qmicli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmi-firmware-update">
-        <term><command>qmi-firmware-update</command></term>
-        <listitem>
-          <para>
-            is an utility used to perform firmware updates on QMI devices
-          </para>
-          <indexterm zone="libqmi qmi-firmware-update">
-            <primary sortas="b-qmi-firmware-update">qmi-firmware-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmi-network">
-        <term><command>qmi-network</command></term>
-        <listitem>
-          <para>
-            is an utility used for simple network management
-            of QMI devices
-          </para>
-          <indexterm zone="libqmi qmi-network">
-            <primary sortas="b-qmi-network">qmi-network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqmi-glib">
-        <term><filename class="libraryfile">libqmi-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for talking to WWAN modems and devices
-            which speak the Qualcomm MSM Interface (QMI) protocol
-          </para>
-          <indexterm zone="libqmi libqmi-glib">
-            <primary sortas="c-libqmi-glib">libqmi-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libseccomp.xml
===================================================================
--- general/genlib/libseccomp.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libseccomp-download-http "https://github.com/seccomp/libseccomp/releases/download/v&libseccomp-version;/libseccomp-&libseccomp-version;.tar.gz">
-  <!ENTITY libseccomp-download-ftp  " ">
-  <!ENTITY libseccomp-md5sum        "c27a5e43cae1e89e6ebfedeea734c9b4">
-  <!ENTITY libseccomp-size          "628 KB">
-  <!ENTITY libseccomp-buildsize     "7.1 MB (additional 4.7 MB for tests)">
-  <!ENTITY libseccomp-time          "less than 0.1 SBU (additional 2.9 SBU for tests)">
-<!-- EDITORS NOTE:
-   This library is heavily dependent on system calls at the time of it's release.
-   This should be tested with every new minor (v4.13, v4.14, etc.) release
-   of the kernel, as it is very finicky and relies on hacks to accomplish
-   it's purpose. -->
-]>
-
-<sect1 id="libseccomp" xreflabel="libseccomp-&libseccomp-version;">
-  <?dbhtml filename="libseccomp.html"?>
-
-
-  <title>libseccomp-&libseccomp-version;</title>
-
-  <indexterm zone="libseccomp">
-    <primary sortas="a-libseccomp">libseccomp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libseccomp</title>
-
-    <para>
-      The <application>libseccomp</application> package provides an easy to use
-      and platform independent interface to the <application>Linux</application>
-      kernel's syscall filtering mechanism.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libseccomp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libseccomp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libseccomp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libseccomp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libseccomp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libseccomp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libseccomp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="which"/> (needed for tests),
-      <xref linkend="valgrind"/>,
-      <!--<xref linkend="cython"/> (for python bindings), -->and
-      <ulink url="https://github.com/linux-test-project/lcov">LCOV</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libseccomp</title>
-
-    <para>
-      Install <application>libseccomp</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"/>
-<!--
-    <para>
-      <option>- -enable-python</option>: this switch is needed to build
-      python bindings if <xref linkend="cython"/> is installed.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          scmp_sys_resolver
-        </seg>
-        <seg>
-          libseccomp.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scmp_sys_resolver">
-        <term><command>scmp_sys_resolver</command></term>
-        <listitem>
-          <para>
-            is used to resolve system calls for applications
-          </para>
-          <indexterm zone="libseccomp scmp_sys_resolver">
-            <primary sortas="b-scmp_sys_resolver">scmp_sys_resolver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libseccomp-lib">
-        <term><filename class="libraryfile">libseccomp.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for translating syscalls
-          </para>
-          <indexterm zone="libseccomp libseccomp-lib">
-            <primary sortas="c-libseccomp-lib">libseccomp.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libsigc++.xml
===================================================================
--- general/genlib/libsigc++.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigc-download-http "&gnome-download-http;/libsigc++/&libsigc-minor;/libsigc++-&libsigc-version;.tar.xz">
-  <!ENTITY libsigc-download-ftp  " ">
-  <!ENTITY libsigc-md5sum        "891f1b2dbaebd8007eda8c639bbe1149">
-  <!ENTITY libsigc-size          "4.8 MB">
-  <!ENTITY libsigc-buildsize     "27 MB (with tests)">
-  <!ENTITY libsigc-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libsigc" xreflabel="libsigc++-&libsigc-version;">
-  <?dbhtml filename="libsigc.html"?>
-
-
-  <title>libsigc++-&libsigc-version;</title>
-
-  <indexterm zone="libsigc">
-    <primary sortas="a-libsigc++">libsigc++</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigc++</title>
-
-    <para>
-      The <application>libsigc++</application> package implements a typesafe
-      callback system for standard C++.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsigc++ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="docbook5"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="fop"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigc++</title>
-
-    <para>
-      Install <application>libsigc++</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: Use this switch if
-      <xref role="nodep" linkend="doxygen"/> is installed and you wish to
-      build and install the API documentation.
-    </para>
-
-  </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>
-          libsigc-2.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/sigc++-2.0 and
-          /usr/share/{devhelp/books,doc}/libsigc++-2.0 (if the documentation is enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigc-2">
-        <term><filename class="libraryfile">libsigc-2.0.so</filename></term>
-        <listitem>
-          <para>
-            provides a typesafe callback system for standard C++
-          </para>
-          <indexterm zone="libsigc libsigc-2">
-            <primary sortas="c-libsigc-2">libsigc-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libsigc++3.xml
===================================================================
--- general/genlib/libsigc++3.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigc-download-http "&gnome-download-http;/libsigc++/&libsigc3-minor;/libsigc++-&libsigc3-version;.tar.xz">
-  <!ENTITY libsigc-download-ftp  " ">
-  <!ENTITY libsigc-md5sum        "b7205d5465ac15fbc0c781d39b4011be">
-  <!ENTITY libsigc-size          "972 KB">
-  <!ENTITY libsigc-buildsize     "12 MB (with tests)">
-  <!ENTITY libsigc-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="libsigc3" xreflabel="libsigc++-&libsigc3-version;">
-  <?dbhtml filename="libsigc3.html"?>
-
-
-  <title>libsigc++-&libsigc3-version;</title>
-
-  <indexterm zone="libsigc3">
-    <primary sortas="a-libsigc++-3">libsigc++-3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigc++</title>
-
-    <para>
-      The <application>libsigc++</application> package implements a typesafe
-      callback system for standard C++. This version is part of a new API for
-      supporting gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libsigc++ Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/>,
-      <xref linkend="docbook5"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="fop"/>, and
-      <ulink url="&gnome-download-http;/mm-common">mm-common</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigc++</title>
-
-    <para>
-      Install <application>libsigc++</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: Use this switch if
-      <xref role="nodep" linkend="doxygen"/> is installed and you wish to
-      build and install the API documentation.
-    </para>
-
-  </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>
-          libsigc-3.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/sigc++-3.0 and
-          /usr/share/{devhelp/books,doc}/libsigc++-3.0 (if the documentation is enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigc-3">
-        <term><filename class="libraryfile">libsigc-3.0.so</filename></term>
-        <listitem>
-          <para>
-            provides a typesafe callback system for standard C++
-          </para>
-          <indexterm zone="libsigc3 libsigc-3">
-            <primary sortas="c-libsigc-3">libsigc-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libsigsegv.xml
===================================================================
--- general/genlib/libsigsegv.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libsigsegv-download-http "&gnu-http;/libsigsegv/libsigsegv-&libsigsegv-version;.tar.gz">
-  <!ENTITY libsigsegv-download-ftp  " ">
-  <!ENTITY libsigsegv-md5sum        "63a2b35f11b2fbccc3d82f9e6c6afd58">
-  <!ENTITY libsigsegv-size          "456 KB">
-  <!ENTITY libsigsegv-buildsize     "3.6 MB (with tests)">
-  <!ENTITY libsigsegv-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libsigsegv" xreflabel="libsigsegv-&libsigsegv-version;">
-  <?dbhtml filename="libsigsegv.html"?>
-
-
-  <title>libsigsegv-&libsigsegv-version;</title>
-
-  <indexterm zone="libsigsegv">
-    <primary sortas="a-libsigsegv">libsigsegv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libsigsegv</title>
-
-    <para>
-      libsigsegv is a library for handling page faults in user mode. A page fault
-      occurs when a program tries to access to a region of memory that is
-      currently not available. Catching and handling a page fault is a useful
-      technique for implementing pageable virtual memory, memory-mapped access
-      to persistent databases, generational garbage collectors, stack overflow
-      handlers, and distributed shared memory.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libsigsegv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libsigsegv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libsigsegv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libsigsegv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libsigsegv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libsigsegv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libsigsegv</title>
-
-    <para>
-      Install <application>libsigsegv</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr   \
-            --enable-shared \
-            --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>
-
-    <para>
-      <parameter>--enable-shared</parameter>: This switch ensures that shared
-      libraries are compiled.
-    </para>
-
-    <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>
-          None
-        </seg>
-        <seg>
-          libsigsegv.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libsigsegv-lib">
-        <term><filename class="libraryfile">libsigsegv.so</filename></term>
-        <listitem>
-          <para>
-            is a library for handling page faults in user mode
-          </para>
-          <indexterm zone="libsigsegv libsigsegv-lib">
-            <primary sortas="c-libsigsegv">libsigsegv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libssh2.xml
===================================================================
--- general/genlib/libssh2.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,187 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libssh2-download-http "https://www.libssh2.org/download/libssh2-&libssh2-version;.tar.gz">
-  <!ENTITY libssh2-download-ftp  " ">
-  <!ENTITY libssh2-md5sum        "a01d543fd891ca48fe47726540d50b17">
-  <!ENTITY libssh2-size          "1.1 MB">
-  <!ENTITY libssh2-buildsize     "13 MB (with tests)">
-  <!ENTITY libssh2-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libssh2" xreflabel="libssh2-&libssh2-version;">
-  <?dbhtml filename="libssh2.html"?>
-
-
-  <title>libssh2-&libssh2-version;</title>
-
-  <indexterm zone="libssh2">
-    <primary sortas="a-libssh2">libssh2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libssh2</title>
-
-    <para>
-      <application>Libssh2</application> package is a client-side C library
-      implementing the SSH2 protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libssh2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libssh2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libssh2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libssh2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libssh2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libssh2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libssh2-&libssh2-version;-security_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libssh2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cmake"/> (can be used instead of the
-      <command>configure</command> script),
-      <xref linkend="libgcrypt"/> (can be used instead of OpenSSL),
-      <xref linkend="openssh"/> (for some tests), and
-      <ulink url='https://www.docker.com'>Docker</ulink> (for some tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libssh2</title>
-
-    <para>
-      <!-- the Terrapin attack -->
-      First, fix a critical security vulnerability in libssh2:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../libssh2-&libssh2-version;-security_fixes-1.patch</userinput></screen>
-
-    <para>
-      If you want to test the package, exclude the tests requiring a static
-      library:
-    </para>
-
-<screen><userinput>sed -E '/^DOCKER_TEST/,/^SSHD_TEST/s/test_(auth_keyboard_info.* |hostkey |simple)/$(NOTHING)/' \
-    -i tests/Makefile.inc &amp;&amp;
-autoreconf -fi</userinput></screen>
-
-    <para>
-      Install <application>libssh2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --disable-docker-tests \
-            --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>
-
-    <para>
-      <parameter>--disable-docker-tests</parameter>: Disable the tests
-      requiring Docker, which is beyond the scope of BLFS.  Remove this
-      switch if you've installed Docker and you wish to run the test suite.
-    </para>
-
-    <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>
-          None
-        </seg>
-        <seg>
-          libssh2.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libssh2-lib">
-        <term><filename class="libraryfile">libssh2.so</filename></term>
-        <listitem>
-          <para>
-            contains functions to use the SSH2 protocol
-          </para>
-          <indexterm zone="libssh2 libssh2-lib">
-            <primary sortas="c-libssh2">libssh2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/libstatgrab.xml
===================================================================
--- general/genlib/libstatgrab.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,206 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libstatgrab-download-http "https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libstatgrab/libstatgrab-&libstatgrab-version;.tar.gz">
-  <!ENTITY libstatgrab-download-ftp  " ">
-  <!ENTITY libstatgrab-md5sum        "af685494e985229e0ac46365bc0cd50e">
-  <!ENTITY libstatgrab-size          "800 KB">
-  <!ENTITY libstatgrab-buildsize     "7.6 MB (with tests)">
-  <!ENTITY libstatgrab-time          "0.1 SBU (add 1.5 SBU for tests)">
-]>
-
-<sect1 id="libstatgrab" xreflabel="libstatgrab-&libstatgrab-version;">
-  <?dbhtml filename="libstatgrab.html"?>
-
-
-  <title>libstatgrab-&libstatgrab-version;</title>
-
-  <indexterm zone="libstatgrab">
-    <primary sortas="a-libstatgrab">libstatgrab</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libstatgrab</title>
-
-    <para>
-      This is a library that provides cross platform access to statistics about
-      the system on which it's run. It's written in C and presents a selection
-      of useful interfaces which can be used to access key system statistics.
-      The current list of statistics includes CPU usage, memory utilisation,
-      disk usage, process counts, network traffic, disk I/O, and more.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libstatgrab-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libstatgrab-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libstatgrab-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libstatgrab-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libstatgrab-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libstatgrab-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libstatgrab Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="log4cplus"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libstatgrab</title>
-
-    <para>
-      Install <application>libstatgrab</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr   \
-            --disable-static \
-            --docdir=/usr/share/doc/libstatgrab-&libstatgrab-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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>
-          saidar, statgrab, statgrab-make-mrtg-config, and
-          statgrab-make-mrtg-index
-        </seg>
-        <seg>
-          libstatgrab.so
-        </seg>
-        <seg>
-          /usr/share/doc/libstatgrab-&libstatgrab-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="saidar">
-        <term><command>saidar</command></term>
-        <listitem>
-          <para>
-            is a curses-based tool for viewing system statistics
-          </para>
-          <indexterm zone="libstatgrab saidar">
-            <primary sortas="b-saidar">saidar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab">
-        <term><command>statgrab</command></term>
-        <listitem>
-          <para>
-            is a sysctl-style interface to system statistics
-          </para>
-          <indexterm zone="libstatgrab statgrab">
-            <primary sortas="b-statgrab">statgrab</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab-make-mrtg-config">
-        <term><command>statgrab-make-mrtg-config</command></term>
-        <listitem>
-          <para>
-            generates MRTG configuration
-          </para>
-          <indexterm zone="libstatgrab statgrab-make-mrtg-config">
-            <primary sortas="b-statgrab-make-mrtg-config">statgrab-make-mrtg-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="statgrab-make-mrtg-index">
-        <term><command>statgrab-make-mrtg-index</command></term>
-        <listitem>
-          <para>
-            generates an XHTML index page from MRTG configuration files or
-            stdin
-          </para>
-          <indexterm zone="libstatgrab statgrab-make-mrtg-index">
-            <primary sortas="b-statgrab-make-mrtg-index">statgrab-make-mrtg-index</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstatgrab-lib">
-        <term><filename class="libraryfile">libstatgrab.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libstatgrab</application> API functions
-          </para>
-          <indexterm zone="libstatgrab libstatgrab-lib">
-            <primary sortas="c-libstatgrab">libstatgrab.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libtasn1.xml
===================================================================
--- general/genlib/libtasn1.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,209 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libtasn1-download-http "&gnu-http;/libtasn1/libtasn1-&libtasn1-version;.tar.gz">
-  <!ENTITY libtasn1-download-ftp  " ">
-  <!ENTITY libtasn1-md5sum        "f701ab57eb8e7d9c105b2cd5d809b29a">
-  <!ENTITY libtasn1-size          "1.7 MB">
-  <!ENTITY libtasn1-buildsize     "17 MB (with tests)">
-  <!ENTITY libtasn1-time          "0.8 SBU (with tests)">
-]>
-
-<sect1 id="libtasn1" xreflabel="libtasn1-&libtasn1-version;">
-  <?dbhtml filename="libtasn1.html"?>
-
-
-  <title>libtasn1-&libtasn1-version;</title>
-
-  <indexterm zone="libtasn1">
-    <primary sortas="a-libtasn1">libtasn1</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libtasn1</title>
-
-    <para>
-      <application>libtasn1</application> is a highly portable C library
-      that encodes and decodes DER/BER data following an ASN.1 schema.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libtasn1-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libtasn1-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libtasn1-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libtasn1-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libtasn1-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libtasn1-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libtasn1 Dependencies</bridgehead>
-
-<!-- does not seem to be needed anymore:
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="six"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libtasn1</title>
-
-    <para>
-      Install <application>libtasn1</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>
-
-    <para>
-      If you did not pass the <option>--enable-gtk-doc</option> parameter
-      to the <command>configure</command> script, you can install the API
-      documentation using the following command as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make -C doc/reference install-data-local</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-problem.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          asn1Coding, asn1Decoding and asn1Parser
-        </seg>
-        <seg>
-          libtasn1.so
-        </seg>
-        <seg>
-          /usr/share/gtk-doc/html/libtasn1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="asn1Coding">
-        <term><command>asn1Coding</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 DER encoder
-          </para>
-          <indexterm zone="libtasn1 asn1Coding">
-            <primary sortas="b-asn1Coding">asn1Coding</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="asn1Decoding">
-        <term><command>asn1Decoding</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 DER decoder
-          </para>
-          <indexterm zone="libtasn1 asn1Decoding">
-            <primary sortas="b-asn1Decoding">asn1Decoding</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="asn1Parser">
-        <term><command>asn1Parser</command></term>
-        <listitem>
-          <para>
-            is an ASN.1 syntax tree generator for
-            <application>libtasn1</application>
-          </para>
-          <indexterm zone="libtasn1 asn1Parser">
-            <primary sortas="b-asn1Parser">asn1Parser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtasn1-lib">
-        <term><filename class="libraryfile">libtasn1.so</filename></term>
-        <listitem>
-          <para>
-            is a library for Abstract Syntax Notation One (ASN.1) and
-            Distinguish Encoding Rules (DER) manipulation
-          </para>
-          <indexterm zone="libtasn1 libtasn1-lib">
-            <primary sortas="c-libtasn1">libtasn1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libunistring.xml
===================================================================
--- general/genlib/libunistring.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libunistring-download-http "&gnu-http;/libunistring/libunistring-&libunistring-version;.tar.xz">
-  <!ENTITY libunistring-download-ftp  " ">
-  <!ENTITY libunistring-md5sum        "6b4ea63617bf09d76e5234379e75e7f9">
-  <!ENTITY libunistring-size          "2.4 MB">
-  <!ENTITY libunistring-buildsize     "54 MB (add 56 MB for tests)">
-  <!ENTITY libunistring-time          "0.5 SBU; add 0.3 SBU for tests; both using parallelism=4">
-]>
-
-<sect1 id="libunistring" xreflabel="libunistring-&libunistring-version;">
-  <?dbhtml filename="libunistring.html"?>
-
-
-  <title>libunistring-&libunistring-version;</title>
-
-  <indexterm zone="libunistring">
-    <primary sortas="a-libunistring">libunistring</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunistring</title>
-
-    <para>
-      <application>libunistring</application> is a library that provides
-      functions for manipulating Unicode strings and for manipulating C
-      strings according to the Unicode standard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunistring-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunistring-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunistring-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunistring-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunistring-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunistring-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunistring Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-      (to rebuild the documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunistring</title>
-
-    <para>
-      Install <application>libunistring</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/libunistring-&libunistring-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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 Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libunistring.so</seg>
-        <seg>
-          /usr/include/unistring and
-          /usr/share/doc/libunistring-&libunistring-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libunistring-lib">
-        <term><command>libunistring.so</command></term>
-        <listitem>
-          <para>
-            provides the unicode string library API
-          </para>
-          <indexterm zone="libunistring libunistring-lib">
-            <primary sortas="c-libunistring-lib">libunistring.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libunwind.xml
===================================================================
--- general/genlib/libunwind.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libunwind-download-http "https://download.savannah.nongnu.org/releases/libunwind/libunwind-&libunwind-version;.tar.gz">
-  <!ENTITY libunwind-download-ftp  " ">
-  <!ENTITY libunwind-md5sum        "f625b6a98ac1976116c71708a73dc44a">
-  <!ENTITY libunwind-size          "884 KB">
-  <!ENTITY libunwind-buildsize     "20 MB (with tests)">
-  <!ENTITY libunwind-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="libunwind" xreflabel="libunwind-&libunwind-version;">
-  <?dbhtml filename="libunwind.html"?>
-
-  <title>libunwind-&libunwind-version;</title>
-
-  <indexterm zone="libunwind">
-    <primary sortas="a-libunwind">libunwind</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libunwind</title>
-
-    <para>
-      The <application>libunwind</application> package contains a portable and
-      efficient C programming interface (API) to determine the call-chain of a
-      program. The API additionally provides the means to manipulate the
-      preserved (callee-saved) state of each call-frame and to resume execution
-      at any point in the call-chain (non-local goto). The API supports both
-      local (same-process) and remote (across-process) operation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libunwind-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libunwind-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libunwind-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libunwind-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libunwind-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libunwind-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libunwind Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="texlive"/> (for latex2man)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libunwind</title>
-
-    <para>
-      Install <application>libunwind</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>.  Two
-      tests, run-coredump-unwind and run-coredump-unwind-mdi are known
-      to fail.
-    </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 Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libunwind.so,
-          libunwind-coredump.so,
-          libunwind-generic.so,
-          libunwind-ptrace.so,
-          libunwind-setjmp.so, and
-          libunwind-x86_64.so (libunwind-x86.so on i686)
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/liburcu.xml
===================================================================
--- general/genlib/liburcu.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,149 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 liburcu-download-http "https://lttng.org/files/urcu/userspace-rcu-&liburcu-version;.tar.bz2">
-  <!ENTITY liburcu-download-ftp  " ">
-  <!ENTITY liburcu-md5sum        "0cd5647788b048a5d6bbdb3b08d46299">
-  <!ENTITY liburcu-size          "648 KB">
-  <!ENTITY liburcu-buildsize     "25 MB (with tests)">
-  <!ENTITY liburcu-time          "0.2 SBU (with tests)">
-
-]>
-
-<sect1 id="liburcu" xreflabel="liburcu-&liburcu-version;">
-  <?dbhtml filename="liburcu.html"?>
-
-
-  <title>liburcu-&liburcu-version;</title>
-
-  <indexterm zone="liburcu">
-    <primary sortas="a-liburcu">liburcu</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to liburcu</title>
-
-    <para>
-      The <application>userspace-rcu</application> package provides
-      a set of userspace RCU (read-copy-update) libraries. These data synchronization
-      libraries provide read-side access which scales linearly with the number of cores.
-      It does so by allowing multiples copies of a given data structure to live at
-      the same time, and by monitoring the data structure accesses to detect grace
-      periods after which memory reclamation is possible.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&liburcu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&liburcu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &liburcu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &liburcu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &liburcu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &liburcu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of liburcu</title>
-
-    <para>
-      Install <application>liburcu</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/liburcu-&liburcu-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          liburcu.so,
-          liburcu-bp.so,
-          liburcu-cds.so,
-          liburcu-common.so,
-          liburcu-mb.so,
-          liburcu-memb.so,
-          liburcu-qsbr.so, and
-          liburcu-signal.so
-        </seg>
-        <seg>
-          /usr/include/urcu and
-          /usr/share/doc/liburcu-&liburcu-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liburcu-lib">
-        <term><filename class="libraryfile">liburcu.so</filename></term>
-        <listitem>
-          <para>
-            provides for
-          </para>
-          <indexterm zone="liburcu liburcu-lib">
-            <primary sortas="c-liburcu">liburcu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/libusb-kernel.xml
===================================================================
--- general/genlib/libusb-kernel.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,15 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE note PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<!-- Automatically generated by kernel-config.py
-     DO NOT EDIT! -->
-<screen><emphasis role='blue'>D</emphasis>evice Drivers ---&gt;
-  [*] <emphasis role='blue'>U</emphasis>SB support ---&gt;                                             [USB_SUPPORT]
-    &lt;*/M&gt;   <emphasis role='blue'>S</emphasis>upport for Host-side USB                                      [USB]
-    [*]     <emphasis role='blue'>P</emphasis>CI based USB host interface                               [USB_PCI]
-    # These are most common USB controller drivers for PC-like systems.
-    # For modern systems often [USB_XHCI_HCD] is the only one needed
-    # even if the system has USB 2.0 ports:
-    &lt; /*/M&gt; <emphasis role='blue'>x</emphasis>HCI HCD (USB 3.0) support                            [USB_XHCI_HCD]
-    &lt; /*/M&gt; <emphasis role='blue'>E</emphasis>HCI HCD (USB 2.0) support                            [USB_EHCI_HCD]
-    &lt; /*/M&gt; <emphasis role='blue'>O</emphasis>HCI HCD (USB 1.1) support                            [USB_OHCI_HCD]</screen>
Index: general/genlib/libusb.xml
===================================================================
--- general/genlib/libusb.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libusb-download-http "https://github.com/libusb/libusb/releases/download/v&libusb-version;/libusb-&libusb-version;.tar.bz2">
-  <!ENTITY libusb-download-ftp  " ">
-  <!ENTITY libusb-md5sum        "1fb61afe370e94f902a67e03eb39c51f">
-  <!ENTITY libusb-size          "632 KB">
-  <!ENTITY libusb-buildsize     "5.7 MB">
-  <!ENTITY libusb-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libusb" xreflabel="libusb-&libusb-version;">
-  <?dbhtml filename="libusb.html"?>
-
-
-  <title>libusb-&libusb-version;</title>
-
-  <indexterm zone="libusb">
-    <primary sortas="a-libusb">libusb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libusb</title>
-
-    <para>
-      The <application>libusb</application> package contains a library
-      used by some applications for USB device access.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libusb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libusb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libusb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libusb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libusb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libusb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libusb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="kernel">
-    <title>Configuring Libusb</title>
-
-    <para id="libusb-kernel">
-      To access raw USB devices (those not treated as a disk by the mass-storage
-      driver), appropriate support must be available in the kernel.  Check your
-      kernel configuration:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="libusb-kernel.xml"/>
-
-    <indexterm zone="libusb libusb-kernel">
-      <primary sortas="d-USB-device-filesystem">Support for Host-side USB</primary>
-    </indexterm>
-
-    <para>
-      For more details on setting up USB devices, see <xref
-      linkend="usb-device-issues"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libusb</title>
-
-    <para>
-      Install <application>libusb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If <application>Doxygen</application> is installed and you wish to
-      build the API documentation, issue the following commands:
-    </para>
-
-<screen remap="doc"><userinput>pushd doc                &amp;&amp;
-  doxygen -u doxygen.cfg &amp;&amp;
-  make docs              &amp;&amp;
-popd</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>
-
-    <para>
-      If you built the API documentation, install it using the following
-      commands as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -d -m755 /usr/share/doc/libusb-&libusb-version;/apidocs &amp;&amp;
-install -v -m644    doc/api-1.0/* \
-                    /usr/share/doc/libusb-&libusb-version;/apidocs</userinput></screen>
-
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: This sed prevents some warnings when
-      building the documentation.
-    </para>
-  </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>
-          libusb-1.0.so
-        </seg>
-        <seg>
-          /usr/include/libusb-1.0 and
-          /usr/share/doc/libusb-&libusb-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libusb-lib">
-        <term><filename class="libraryfile">libusb-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions used for accessing USB hardware
-          </para>
-          <indexterm zone="libusb libusb-lib">
-            <primary sortas="c-libusb">libusb-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libuv.xml
===================================================================
--- general/genlib/libuv.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libuv-download-http "https://dist.libuv.org/dist/v&libuv-version;/libuv-v&libuv-version;.tar.gz">
-  <!ENTITY libuv-download-ftp  " ">
-  <!ENTITY libuv-md5sum        "a808517c32ebd07c561bf21a4e30aeab">
-  <!ENTITY libuv-size          "1.3 MB">
-  <!ENTITY libuv-buildsize     "14 MB (add 16 MB for tests)">
-  <!ENTITY libuv-time          "less than 0.1 SBU (add 0.5 SBU for tests)">
-]>
-
-<sect1 id="libuv" xreflabel="libuv-&libuv-version;">
-  <?dbhtml filename="libuv.html"?>
-
-
-  <title>libuv-&libuv-version;</title>
-
-  <indexterm zone="libuv">
-    <primary sortas="a-libuv">libuv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libuv</title>
-
-    <para>
-      The <application>libuv</application> package is a
-      multi-platform support library with a focus on asynchronous I/O.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libuv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libuv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libuv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libuv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libuv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libuv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libuv Dependencies</bridgehead>
-<!--
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="???"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libuv</title>
-
-    <para>
-      Install <application>libuv</application> by running the following
-      commands:
-    </para>
-
-    <caution>
-      <para>
-        The <command>sh autogen.sh</command> command below fails if the ACLOCAL
-        environment variable is set as specified in <xref linkend="xorg7"/>.
-        If it is used, ACLOCAL needs to be unset for this package and then
-        reset for other packages.
-      </para>
-    </caution>
-
-<!--
-Don't use cmake here to avoid circular dependency
-
-<screen><userinput>sed -i "/TARGETS uv_a ARCHIVE/d" CMakeLists.txt &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
-make </userinput></screen>
--->
-
-<screen><userinput>sh autogen.sh                              &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make </userinput></screen>
-
-    <para>
-      If you installed the optional <xref linkend="sphinx"/> python module,
-      create the man page:
-    </para>
-
-<screen remap="doc"><userinput>make man -C docs</userinput></screen>
-
-    <para>
-      If you want to run the tests, run: <command>make check</command> as
-      a non-root user. <!-- the test suite refuses to run as root -->
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
- 
-    <para>
-      If you built the man page, install it  as the &root; user:
-    </para>
-    
-<screen role="root" remap="doc"><userinput>install -Dm644 docs/build/man/libuv.1 /usr/share/man/man1</userinput></screen>
-
-  </sect2>
-
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ...</command>: This command disables installation
-      of the static library.
-    </para>
-
-  </sect2>
--->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libuv.so
-        </seg>
-        <seg>
-          /usr/include/uv
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libuv.so">
-        <term><filename class="libraryfile">libuv.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for asynchronous I/O operations
-          </para>
-          <indexterm zone="libuv libuv.so">
-            <primary sortas="c-libuv.so">libuv.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libwacom.xml
===================================================================
--- general/genlib/libwacom.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,242 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libwacom-download-http "https://github.com/linuxwacom/libwacom/releases/download/libwacom-&libwacom-version;/libwacom-&libwacom-version;.tar.xz">
-  <!ENTITY libwacom-download-ftp  " ">
-  <!ENTITY libwacom-md5sum        "fa489522c2b5f014360f44a3e38a30f8">
-  <!ENTITY libwacom-size          "116 KB">
-  <!ENTITY libwacom-buildsize     "3.6 MB (with tests)">
-  <!ENTITY libwacom-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libwacom" xreflabel="libwacom-&libwacom-version;">
-  <?dbhtml filename="libwacom.html"?>
-
-
-  <title>libwacom-&libwacom-version;</title>
-
-  <indexterm zone="libwacom">
-    <primary sortas="a-libwacom">libwacom</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libwacom</title>
-
-    <para>
-      The <application>libwacom</application> package contains a library used
-      to identify wacom tablets and their model-specific features.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libwacom-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libwacom-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libwacom-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libwacom-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libwacom-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libwacom-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libwacom Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="git"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="valgrind"/> (optional for some tests), and
-      <xref linkend="pytest"/> with
-      <ulink url="https://pypi.org/project/libevdev/">python-libevdev</ulink> and
-      <ulink url="https://pypi.org/project/pyudev/">pyudev</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libwacom</title>
-
-<!--  Fixed in libwacom-1.7
-    <para>
-      First, adapt the udev rules to upstream udev/kernel changes:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/ACTION!="add|change"/ACTION=="remove"/' tools/65-libwacom.rules.in</userinput></screen>
--->
-
-    <para>
-      Install <application>libwacom</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dtests=disabled    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      To run additional tests, install
-      <xref linkend="pytest"/>, python-libevdev, and pyudev, then remove
-      the "-Dtests=disabled" option from the meson line above.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <parameter>-Dtests=disabled</parameter>: This parameter disables some of
-      the more advanced tests because they require <xref linkend="pytest"/> and
-      other two Python modules beyond the scope of BLFS to work properly.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          libwacom-list-devices,
-          libwacom-list-local-devices,
-          libwacom-show-stylus, and
-          libwacom-update-db
-        </seg>
-        <seg>
-          libwacom.so
-        </seg>
-        <seg>
-          /usr/include/libwacom-1.0 and
-          /usr/share/libwacom
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libwacom-list-devices">
-        <term><command>libwacom-list-devices</command></term>
-        <listitem>
-          <para>
-            lists all tablet devices that are supported by libwacom
-          </para>
-          <indexterm zone="libwacom libwacom-list-devices">
-            <primary sortas="b-libwacom-list-devices">libwacom-list-devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-list-local-devices">
-        <term><command>libwacom-list-local-devices</command></term>
-        <listitem>
-          <para>
-            lists tablet devices that are connected to the system
-          </para>
-          <indexterm zone="libwacom libwacom-list-local-devices">
-            <primary sortas="b-libwacom-list-local-devices">libwacom-list-local-devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-show-stylus">
-        <term><command>libwacom-show-stylus</command></term>
-        <listitem>
-          <para>
-            lists tablet stylus IDs
-          </para>
-          <indexterm zone="libwacom libwacom-show-stylus">
-            <primary sortas="b-libwacom-show-stylus">libwacom-show-stylus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-update-db">
-        <term><command>libwacom-update-db</command></term>
-        <listitem>
-          <para>
-            updates the system according to the current set of tablet data files
-          </para>
-          <indexterm zone="libwacom libwacom-update-db">
-            <primary sortas="b-libwacom-update-db">libwacom-update-db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwacom-lib">
-        <term><filename class="libraryfile">libwacom.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used for accessing Wacom information
-          </para>
-          <indexterm zone="libwacom libwacom-lib">
-            <primary sortas="c-libwacom">libwacom.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libxkbcommon.xml
===================================================================
--- general/genlib/libxkbcommon.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxkbcommon-download-http "https://xkbcommon.org/download/libxkbcommon-&libxkbcommon-version;.tar.xz">
-  <!ENTITY libxkbcommon-download-ftp  " ">
-  <!ENTITY libxkbcommon-md5sum        "b05b1a0d473189efb2dd995dd944f152">
-  <!ENTITY libxkbcommon-size          "524 KB">
-  <!ENTITY libxkbcommon-buildsize     "26 MB (with tests)">
-  <!ENTITY libxkbcommon-time          "0.5 SBU (with tests)">
-]>
-
-<sect1 id="libxkbcommon" xreflabel="libxkbcommon-&libxkbcommon-version;">
-  <?dbhtml filename="libxkbcommon.html"?>
-
-
-  <title>libxkbcommon-&libxkbcommon-version;</title>
-
-  <indexterm zone="libxkbcommon">
-    <primary sortas="a-libxkbcommon">libxkbcommon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxkbcommon</title>
-
-    <para>
-      <application>libxkbcommon</application> is a keymap compiler and
-      support library which processes a reduced subset of keymaps as
-      defined by the XKB specification.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxkbcommon-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxkbcommon-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxkbcommon-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxkbcommon-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxkbcommon-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxkbcommon-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxkbcommon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="xkeyboard-config"/> (runtime)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-       <xref linkend="libxcb"/>,
-       <xref linkend="wayland"/>, and
-       <xref linkend="wayland-protocols"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-       <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxkbcommon</title>
-
-    <para>
-      Install <application>libxkbcommon</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Denable-docs=false &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <!--
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>- -disable-x11</option>: Use this switch if you
-      have not installed <xref linkend="libxcb"/> and
-      don't need the <filename>libxkbcommon-x11.so</filename>
-      library.
-    </para>
-    -->
-
-    <para>
-      <parameter>-Denable-docs=true</parameter>: This switch enables
-      documentation generation. The <xref linkend="doxygen"/> is
-      required.
-    </para>
-
-    <para>
-      <command>mv -v /usr/share/doc/libxkbcommon{,-&libxkbcommon-version;}</command>:
-      If you built the documentation, use this command to install the
-      it in a versioned directory.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xkbcli
-        </seg>
-        <seg>
-          libxkbcommon.so,
-          libxkbcommon-x11.so, and
-          libxkbregistry.so
-        </seg>
-        <seg>
-          /usr/include/xkbcommon,
-          /usr/libexec/xkbcommon, and
-          /usr/share/doc/libxkbcommon-&libxkbcommon-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xkbcli">
-        <term><command>xkbcli</command></term>
-        <listitem>
-          <para>
-            provides a debugger and compiler for XKB keymaps
-          </para>
-          <indexterm zone="libxkbcommon xkbcli">
-            <primary sortas="b-xkbcli">xkbcli</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbcommon-lib">
-        <term><filename class="libraryfile">libxkbcommon.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libxkbcommon</application> API functions
-          </para>
-          <indexterm zone="libxkbcommon libxkbcommon-lib">
-            <primary sortas="c-libxkbcommon">libxkbcommon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxkbcommon-x11">
-        <term><filename class="libraryfile">libxkbcommon-x11.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libxkbcommon</application> X11 specific API
-            functions
-          </para>
-          <indexterm zone="libxkbcommon libxkbcommon-x11">
-            <primary sortas="c-libxkbcommon-x11">libxkbcommon-x11.so</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="libxkbregistry">
-       <term><filename class="libraryfile">libxkbregistry.so</filename></term>
-       <listitem>
-         <para>
-           contains a list of available XKB models, layouts, and variants for a
-           given ruleset
-         </para>
-         <indexterm zone="libxkbcommon libxkbregistry">
-           <primary sortas="c-libxkbregistry">libxkbregistry.so</primary>
-         </indexterm>
-       </listitem>
-     </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/libxml.xml
===================================================================
--- general/genlib/libxml.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/libxml.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="libxml" xreflabel="libxml-&libxml-version;">
+<?dbhtml filename="libxml.html" dir="general"?>
+<title>libxml-&libxml-version;</title>
+
+&libxml-intro;
+&libxml-inst;
+&libxml-config;
+&libxml-desc;
+
+</sect1>
Index: general/genlib/libxml2.xml
===================================================================
--- general/genlib/libxml2.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ general/genlib/libxml2.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,295 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
+<sect1 id="libxml2" xreflabel="libxml2-&libxml2-version;">
+<?dbhtml filename="libxml2.html" dir="general"?>
+<title>libxml2-&libxml2-version;</title>
 
-  <!-- Also update the download, md5, size entities in libxml2py2.xml -->
-  <!ENTITY libxml2-download-http "https://download.gnome.org/sources/libxml2/2.12/libxml2-&libxml2-version;.tar.xz">
-<!--  <!ENTITY libxml2-download-http "http://xmlsoft.org/sources/libxml2-&libxml2-version;.tar.xz">-->
-  <!ENTITY libxml2-download-ftp  " ">
-  <!ENTITY libxml2-md5sum        "37fab9ace78d8a085af81dc9a19f36d9">
-  <!ENTITY libxml2-size          "2.5 MB">
-  <!ENTITY libxml2-buildsize     "103 MB (with tests)">
-  <!ENTITY libxml2-time          "0.4 SBU (Using parallelism=4; with tests)">
-  <!ENTITY testsuite-version     "20130923">
-]>
-
-<sect1 id="libxml2" xreflabel="libxml2-&libxml2-version;">
-  <?dbhtml filename="libxml2.html"?>
-
-
-  <title>libxml2-&libxml2-version;</title>
-
-  <indexterm zone="libxml2">
-    <primary sortas="a-libxml2">libxml2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxml2</title>
-
-    <para>
-      The <application>libxml2</application> package contains libraries
-      and utilities used for parsing XML files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxml2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxml2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxml2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxml2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxml2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxml2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Optional Test Suite:
-          <ulink url="https://www.w3.org/XML/Test/xmlts&testsuite-version;.tar.gz"/> - This
-          enables <command>make check</command> to do complete testing.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxml2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="icu"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> (may be used in the tests)
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxml2</title>
-
-    <para>
-      Install <application>libxml2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr           \
-            --sysconfdir=/etc       \
-            --disable-static        \
-            --with-history          \
-            --with-icu              \
-            PYTHON=/usr/bin/python3 \
-            --docdir=/usr/share/doc/libxml2-&libxml2-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you downloaded the test suite, issue the following command:
-    </para>
-
-<screen><userinput>tar xf ../xmlts&testsuite-version;.tar.gz</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check &gt; check.log</command>.
-      This command will print several lines of error messages like
-      <quote><computeroutput>Failed to parse
-      xstc/...</computeroutput></quote> because some test files are missing
-      and these messages can be safely ignored.
-      A summary of the results can be obtained with <command>grep -E
-      '^Total|expected|Ran' check.log</command>. If <xref linkend="valgrind"/> is
-      installed and you want to check for memory leaks, replace
-      <command>check</command> with <command>check-valgrind</command>.
-    </para>
-
-    <note>
-      <para>
-        The tests use <ulink url="http://localhost/">http://localhost/</ulink>
-        to test parsing of external entities. If the machine where you run the
-        tests serves as a web site, the tests may hang, depending on the
-        content of the file served. It is therefore recommended to shut down
-        the server during the tests, as the <systemitem
-        class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump" revision="sysv"><userinput>/etc/init.d/httpd stop</userinput></screen>
-<screen role="nodump" revision="systemd"><userinput>systemctl stop httpd.service</userinput></screen>
-
-    </note>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      Finally, prevent some packages from unnecessarily linking to ICU using
-      the following commands as the &root; user:
-    </para>
-
-<screen role="root"><userinput>rm -vf /usr/lib/libxml2.la &amp;&amp;
-sed '/libs=/s/xml2.*/xml2"/' -i /usr/bin/xml2-config</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"/>
-
-    <para>
-      <parameter>--with-history</parameter>: This switch enables
-      <application>Readline</application> support when running
-      <command>xmlcatalog</command> or <command>xmllint</command> in shell mode.
-    </para>
-
-    <para>
-      <parameter>--with-icu</parameter>: This switch enables support for
-      <application>ICU</application>, which provides additional Unicode support.
-      This is needed for some packages in BLFS, such as for QtWebEngine.
-    </para>
-
-    <para>
-      <parameter>PYTHON=/usr/bin/python3</parameter>: Allows building
-      the libxml2 module with Python3 instead of Python2.
-    </para>
-
-<!--
-    <para>
-      <option>- -with-icu</option>: Add this switch if you have built
-      <xref linkend="icu"/>, for better unicode support.
-    </para>
-
-    <note>
-      <para>
-        If the <option>- -with-icu</option> switch is used, the BLFS editors
-        recommend removing unneeded references to the ICU libraries. This
-        will prevent many packages that use libxml2 from unnecessarily linking
-        to the ICU libraries.  This, in turn, will prevent the need for
-        rebuilding many packages when upgrading ICU to a new major version.
-        After installing libxml2, as the &root; user, issue:
-      </para>
-
-<screen role="nodump"><userinput>rm -vf /usr/lib/libxml2.la &amp;&amp;
-sed '/libs=/s/xml2.*/xml2"/' -i /usr/bin/xml2-config</userinput></screen>
-    </note>
--->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xml2-config,
-          xmlcatalog, and
-          xmllint
-        </seg>
-        <seg>
-          libxml2.so
-        </seg>
-        <seg>
-          /usr/include/libxml2,
-          /usr/lib/cmake/libxml2,
-          /usr/share/doc/libxml2-&libxml2-version;, and
-          /usr/share/gtk-doc/html/libxml2
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xml2-config">
-        <term><command>xml2-config</command></term>
-        <listitem>
-          <para>
-            determines the compile and linker flags that should be used to
-            compile and link programs that use
-            <filename class="libraryfile">libxml2</filename>
-          </para>
-          <indexterm zone="libxml2 xml2-config">
-            <primary sortas="b-xml2-config">xml2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlcatalog">
-        <term><command>xmlcatalog</command></term>
-        <listitem>
-          <para>
-            is used to monitor and manipulate XML and SGML catalogs
-          </para>
-          <indexterm zone="libxml2 xmlcatalog">
-            <primary sortas="b-xmlcatalog">xmlcatalog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmllint">
-        <term><command>xmllint</command></term>
-        <listitem>
-          <para>
-            parses XML files and outputs reports (based upon options) to detect
-            errors in XML coding
-          </para>
-          <indexterm zone="libxml2 xmllint">
-            <primary sortas="b-xmllint">xmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxml2-lib">
-        <term><filename class="libraryfile">libxml2.so</filename></term>
-        <listitem>
-          <para>
-            provides functions for programs to parse files that use the XML
-            format
-          </para>
-          <indexterm zone="libxml2 libxml2-lib">
-            <primary sortas="c-libxml2">libxml2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libxml2-intro;
+&libxml2-inst;
+&libxml2-config;
+&libxml2-desc;
 
 </sect1>
+
Index: general/genlib/libxmlb.xml
===================================================================
--- general/genlib/libxmlb.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 libxmlb-download-http "https://github.com/hughsie/libxmlb/releases/download/&libxmlb-version;/libxmlb-&libxmlb-version;.tar.xz">
-  <!ENTITY libxmlb-download-ftp  " ">
-  <!ENTITY libxmlb-md5sum        "1be8bd9a217534682bca5cb709fe2f78">
-  <!ENTITY libxmlb-size          "104 KB">
-  <!ENTITY libxmlb-buildsize     "3.8 MB">
-  <!ENTITY libxmlb-time          "0.1 SBU">
-]>
-
-<sect1 id="libxmlb" xreflabel="libxmlb-&libxmlb-version;">
-  <?dbhtml filename="libxmlb.html"?>
-
-  <title>libxmlb-&libxmlb-version;</title>
-
-  <indexterm zone="libxmlb">
-    <primary sortas="a-libxmlb">libxmlb</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxmlb</title>
-
-    <para>
-      The <application>libxmlb</application> package contains a library and
-      a tool which help create and query binary XML blobs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxmlb-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxmlb-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxmlb-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxmlb-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxmlb-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxmlb-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxmlb Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-    </para>
-
-    <!--  Only use this if you want to note something in the wiki
-    <para condition="html" role="usernotes">
-      Editor Notes: <ulink url="&blfs-wiki;/libxmlb"/>
-    </para>
-    -->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxmlb</title>
-
-    <para>
-      Install <application>libxmlb</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release -Dgtkdoc=false .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-    
-<!-- Over in meson_options.txt, gtkdoc is set to 'true' by default. This would
-     introduce a dependency on gtk-doc, so let's set it as 'false' and let the
-     user enable it if they want the documentation. -renodr -->
-    <para>
-      <parameter>-Dgtkdoc=false</parameter>: This switch disables building the
-      API documentation. Remove it if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to build the
-      API documentation.
-    </para>
-
-    <para>
-      <option>-Dintrospection=false</option>: Use this switch if you do not
-      have built <xref linkend='glib2'/> with GObject Introspection.
-    </para>
-
-    <para>
-      <option>-Dstemmer=true</option>: Use this switch if you have
-      <ulink url="https://github.com/zvelo/libstemmer">libstemmer</ulink>
-      installed and wish to build stemmer support.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xb-tool
-        </seg>
-        <seg>
-          libxmlb.so
-        </seg>
-        <seg>
-          /usr/include/libxmlb-2,
-          /usr/libexec/installed-tests/libxmlb, and
-          /usr/share/gtk-doc/html/libxmlb (if gtk-doc was enabled)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xb-tool">
-        <term><command>xb-tool</command></term>
-        <listitem>
-          <para>
-            is a tool used to create, dump, or query a binary XML blob
-          </para>
-          <indexterm zone="libxmlb xb-tool">
-            <primary sortas="b-xb-tool">xb-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxmlb-lib">
-        <term><filename class="libraryfile">libxmlb.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow for creating and querying binary XML
-            blobs
-          </para>
-          <indexterm zone="libxmlb libxmlb-lib">
-            <primary sortas="c-libxmlb">libxmlb.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/libxslt.xml
===================================================================
--- general/genlib/libxslt.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ general/genlib/libxslt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,232 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
+<sect1 id="libxslt" xreflabel="libxslt-&libxslt-version;">
+<?dbhtml filename="libxslt.html" dir="general"?>
+<title>libxslt-&libxslt-version;</title>
 
-  <!ENTITY libxslt-download-http "https://download.gnome.org/sources/libxslt/1.1/libxslt-&libxslt-version;.tar.xz">
-  <!ENTITY libxslt-download-ftp  " ">
-  <!ENTITY libxslt-md5sum        "22e9eb7c23825124e786611b3760a3c7">
-  <!ENTITY libxslt-size          "1.5 MB">
-  <!ENTITY libxslt-buildsize     "34 MB (with tests)">
-  <!ENTITY libxslt-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libxslt" xreflabel="libxslt-&libxslt-version;">
-  <?dbhtml filename="libxslt.html"?>
-
-
-  <title>libxslt-&libxslt-version;</title>
-
-  <indexterm zone="libxslt">
-    <primary sortas="a-libxslt">libxslt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxslt</title>
-
-    <para>
-      The <application>libxslt</application> package contains
-      XSLT libraries used for extending <filename
-      class="libraryfile">libxml2</filename> libraries to
-      support XSLT files.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxslt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxslt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxslt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxslt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxslt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxslt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/libxslt-&libxslt-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libxslt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (at runtime)</bridgehead>
-    <para role="recommended">
-      <xref role="runtime" linkend="DocBook"/> and
-      <xref role="runtime" linkend="docbook-xsl"/>
-    </para>
-
-    <note>
-      <para>
-        Although it is not a direct dependency, many applications
-        using <application>libxslt</application> will expect
-        <xref linkend="DocBook"/> and <xref linkend="docbook-xsl"/>
-        to be present.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libgcrypt"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxslt</title>
-
-    <para>
-      Install <application>libxslt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                          \
-            --disable-static                       \
-            --docdir=/usr/share/doc/libxslt-&libxslt-version; \
-            PYTHON=/usr/bin/python3 &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"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          xslt-config and xsltproc
-        </seg>
-        <seg>
-          libexslt.so, libxslt.so and optionally, libxsltmod.so
-          <application>Python</application> module
-        </seg>
-        <seg>
-          /usr/include/libexslt,
-          /usr/include/libxslt,
-          /usr/lib/cmake/libxslt,
-          /usr/lib/libxslt-plugins,
-          /usr/share/gtk-doc/lib{xslt,exslt},
-          /usr/share/doc/libxslt-&libxslt-version;, and
-          /usr/share/doc/libxslt-python-&libxslt-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="xslt-config">
-        <term><command>xslt-config</command></term>
-        <listitem>
-          <para>
-            is used to find out the pre-processor, linking and
-            compiling flags necessary to use the <application>libxslt</application>
-            libraries in 3rd-party programs
-          </para>
-          <indexterm zone="libxslt xslt-config">
-            <primary sortas="b-xslt-config">xslt-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xsltproc">
-        <term><command>xsltproc</command></term>
-        <listitem>
-          <para>
-            is used to apply XSLT stylesheets to XML documents
-          </para>
-          <indexterm zone="libxslt xsltproc">
-            <primary sortas="b-xsltproc">xsltproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexslt">
-        <term><filename class="libraryfile">libexslt.so</filename></term>
-        <listitem>
-          <para>
-            is used to provide extensions to XSLT functions
-          </para>
-          <indexterm zone="libxslt libexslt">
-            <primary sortas="c-libexslt">libexslt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxslt-lib">
-        <term><filename class="libraryfile">libxslt.so</filename></term>
-        <listitem>
-          <para>
-            provides extensions to the
-            <filename class="libraryfile">libxml2</filename>
-            libraries to parse files that use the XSLT format
-          </para>
-          <indexterm zone="libxslt libxslt-lib">
-            <primary sortas="c-libxslt">libxslt.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&libxslt-intro;
+&libxslt-inst;
+&libxslt-config;
+&libxslt-desc;
 
 </sect1>
+
Index: general/genlib/libyaml.xml
===================================================================
--- general/genlib/libyaml.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 yaml-download-http "https://github.com/yaml/libyaml/releases/download/&yaml-version;/yaml-&yaml-version;.tar.gz">
-  <!ENTITY yaml-download-ftp  " ">
-  <!ENTITY yaml-md5sum        "bb15429d8fb787e7d3f1c83ae129a999">
-  <!ENTITY yaml-size          "596 KB">
-  <!ENTITY yaml-buildsize     "6.4 MB (with tests)">
-  <!ENTITY yaml-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="libyaml" xreflabel="libyaml-&yaml-version;">
-  <?dbhtml filename="libyaml.html"?>
-
-
-  <title>libyaml-&yaml-version;</title>
-
-  <indexterm zone="libyaml">
-    <primary sortas="a-libyaml">libyaml</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libyaml</title>
-
-    <para>
-      The <application>yaml</application> package contains a C
-      library for parsing and emitting YAML (YAML Ain't Markup
-      Language) code.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&yaml-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&yaml-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &yaml-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &yaml-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &yaml-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &yaml-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libyaml Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libyaml</title>
-
-    <para>
-      Install <application>libyaml</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-<!--
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_SHARED_LIBS=true    \
-      -DCMAKE_BUILD_TYPE=RELEASE ..  &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"/>
-
-  </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>
-          libyaml.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libyaml-lib">
-        <term><filename class="libraryfile">libyaml.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for parsing and emitting YAML code
-          </para>
-          <indexterm zone="libyaml libyaml-lib">
-            <primary sortas="c-libyaml">libyaml.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/log4cplus.xml
===================================================================
--- general/genlib/log4cplus.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 log4cplus-download-http "https://github.com/log4cplus/log4cplus/releases/download/REL_&log4cplus-release;/log4cplus-&log4cplus-version;.tar.xz">
-  <!ENTITY log4cplus-download-ftp  " ">
-  <!ENTITY log4cplus-md5sum        "6ee2555be39cd269086cc871c834e43f">
-  <!ENTITY log4cplus-size          "919 KB">
-  <!ENTITY log4cplus-buildsize     "73 MB">
-  <!ENTITY log4cplus-time          "0.3 SBU (Using parallelism=4; add 0.5 SBU for tests)">
-]>
-
-<sect1 id="log4cplus" xreflabel="log4cplus-&log4cplus-version;">
-  <?dbhtml filename="log4cplus.html"?>
-
-
-  <title>log4cplus-&log4cplus-version;</title>
-
-  <indexterm zone="log4cplus">
-    <primary sortas="a-log4cplus">log4cplus</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to log4cplus</title>
-
-    <para>
-      <application>log4cplus</application> is an easy to use C++20
-      logging API providing thread-safe, flexible, and arbitrarily
-      granular control over log management and configuration. It is
-      modeled after the Java log4j API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&log4cplus-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&log4cplus-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &log4cplus-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &log4cplus-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &log4cplus-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &log4cplus-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">log4cplus Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &qt5-deps;
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of log4cplus</title>
-
-    <para>
-      Build <application>log4cplus</application> by running the following
-      command:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, install the package as the
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>--with-qt5</option>: This option enables
-      compilation of a separate shared library (liblog4cplusqt5debugappender)
-      that implements Qt5DebugAppender. It requires Qt5 and pkg-config
-      to be available.
-    </para>
-
-  </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>
-          log4cplus.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="log4cplus-lib">
-        <term><filename class="libraryfile">log4cplus.so</filename></term>
-        <listitem>
-          <para>
-            is the log4cplus library
-          </para>
-          <indexterm zone="log4cplus log4cplus-lib">
-            <primary sortas="c-log4cplus">log4cplus.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/lzo.xml
===================================================================
--- general/genlib/lzo.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,151 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 lzo-download-http "https://www.oberhumer.com/opensource/lzo/download/lzo-&lzo-version;.tar.gz">
-  <!ENTITY lzo-download-ftp  " ">
-  <!ENTITY lzo-md5sum        "39d3f3f9c55c87b1e5d6888e1420f4b5">
-  <!ENTITY lzo-size          "588 KB">
-  <!ENTITY lzo-buildsize     "12 MB">
-  <!ENTITY lzo-time          "0.3 SBU (with tests)">
-]>
-
-<sect1 id="lzo" xreflabel="LZO-&lzo-version;">
-  <?dbhtml filename="lzo.html"?>
-
-
-  <title>LZO-&lzo-version;</title>
-
-  <indexterm zone="lzo">
-    <primary sortas="a-LZO">LZO</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to LZO</title>
-
-    <para>
-      <application>LZO</application> is a data compression
-      library which is suitable for data decompression and compression in
-      real-time. This means it favors speed over compression ratio.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lzo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lzo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lzo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lzo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lzo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lzo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of LZO</title>
-
-    <para>
-      Install <application>LZO</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                    \
-            --enable-shared                  \
-            --disable-static                 \
-            --docdir=/usr/share/doc/lzo-&lzo-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>. All the
-      checks should pass. Now issue <command>make test</command> to run the full
-      suite of tests.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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>
-          liblzo2.so
-        </seg>
-        <seg>
-          /usr/include/lzo and
-          /usr/share/doc/lzo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="liblzo2">
-        <term><filename class="libraryfile">liblzo2.so</filename></term>
-        <listitem>
-          <para>
-            is a data compression and decompression library
-          </para>
-          <indexterm zone="lzo liblzo2">
-            <primary sortas="c-liblzo2">liblzo2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/mtdev.xml
===================================================================
--- general/genlib/mtdev.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 mtdev-download-http "https://bitmath.org/code/mtdev/mtdev-&mtdev-version;.tar.bz2">
-  <!ENTITY mtdev-download-ftp  " ">
-  <!ENTITY mtdev-md5sum        "483ed7fdf7c1e7b7375c05a62848cce7">
-  <!ENTITY mtdev-size          "296 KB">
-  <!ENTITY mtdev-buildsize     "2.5 MB">
-  <!ENTITY mtdev-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="mtdev" xreflabel="mtdev-&mtdev-version;">
-  <?dbhtml filename="mtdev.html"?>
-
-
-  <title>mtdev-&mtdev-version;</title>
-
-  <indexterm zone="mtdev">
-    <primary sortas="a-mtdev">mtdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to mtdev</title>
-
-    <para>
-      The <application>mtdev</application> package contains Multitouch
-      Protocol Translation Library which is used to transform all
-      variants of kernel MT (Multitouch) events to the slotted type B
-      protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&mtdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&mtdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &mtdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &mtdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &mtdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &mtdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of mtdev</title>
-
-    <para>
-      Install <application>mtdev</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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          mtdev-test
-        </seg>
-        <seg>
-          libmtdev.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mtdev-test">
-        <term><command>mtdev-test</command></term>
-        <listitem>
-          <para>
-            is a tool to test <filename class="libraryfile">libmtdev</filename>
-          </para>
-          <indexterm zone="mtdev mtdev-test">
-            <primary sortas="b-mtdev-test">mtdev-test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmtdev">
-        <term><filename class="libraryfile">libmtdev.so</filename></term>
-        <listitem>
-          <para>
-            contains Multitouch Protocol Translation API functions
-          </para>
-          <indexterm zone="mtdev libmtdev">
-            <primary sortas="c-libmtdev">libmtdev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/nodejs.xml
===================================================================
--- general/genlib/nodejs.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nodejs-download-http "https://nodejs.org/dist/v&nodejs-version;/node-v&nodejs-version;.tar.xz">
-  <!ENTITY nodejs-download-ftp  " ">
-  <!ENTITY nodejs-md5sum        "85986134f75f98e9a1c006e7a72d1172">
-  <!ENTITY nodejs-size          "40 MB">
-  <!ENTITY nodejs-buildsize     "974 MB (add 62 MB for tests)">
-  <!ENTITY nodejs-time          "10.9 SBU (add 3.2 SBU for tests: both using parallelism=8 and 8 CPUs online, parts of the tests will use all online CPUs)">
-]>
-
-<sect1 id="nodejs" xreflabel="nodejs-&nodejs-version;">
-  <?dbhtml filename="nodejs.html"?>
-
-
-  <title>Node.js-&nodejs-version;</title>
-
-  <indexterm zone="nodejs">
-    <primary sortas="a-nodejs">nodejs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Node.js</title>
-
-    <para>
-      <application>Node.js</application> is a
-      <application>JavaScript</application> runtime built on
-      <application>Chrome's</application> V8 JavaScript engine.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nodejs-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nodejs-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nodejs-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &nodejs-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nodejs-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nodejs-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/node-v&nodejs-version;-icu_69-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Node.js Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="brotli"/>,
-      <xref linkend="c-ares"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libuv"/>, and
-      <xref linkend="nghttp2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/nodejs/http-parser">http-parser</ulink> and
-      <ulink url="https://www.npmjs.com/">npm</ulink> (an internal copy of
-      <command>npm</command> will be installed if not present)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Node.js</title>
-
-<!--
-    <para>
-      If Python-3.12 is installed, fix the <command>configure</command> script:
-    </para>
-
-<screen><userinput>sed -e '/python3.11/i command -v python3.12 >/dev/null &amp;&amp; exec python3.12 "$0" "$@"' \
-    -e '/3, 11/s/\(.3, 11.\)/(3, 12), \1/' \
-    -i configure</userinput></screen>
--->
-
-    <para>
-      Build <application>Node.js</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr          \
-            --shared-brotli        \
-            --shared-cares         \
-            --shared-libuv         \
-            --shared-openssl       \
-            --shared-nghttp2       \
-            --shared-zlib          \
-            --with-intl=system-icu &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make test-only</command>.
-<!--
-Failed tests:
-out/Release/node - -tls-min-v1.0 /build/node/node-v18.18.2/test/parallel/test-https-agent-session-eviction.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-alert.js
-out/Release/node - -tls-max-v1.2 /build/node/node-v18.18.2/test/parallel/test-tls-cli-max-version-1.2.js
-out/Release/node - -tls-max-v1.3 /build/node/node-v18.18.2/test/parallel/test-tls-cli-max-version-1.3.js
-out/Release/node - -tls-min-v1.1 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.1.js
-out/Release/node - -tls-min-v1.2 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.2.js
-out/Release/node - -tls-min-v1.3 /build/node/node-v18.18.2/test/parallel/test-tls-cli-min-version-1.3.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-getprotocol.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-min-max-version.js
-out/Release/node /build/node/node-v18.18.2/test/parallel/test-tls-session-cache.js
-
-For node-v20.9.0 all 3969 tests passed.  bdubbs 3 Nov 23
--->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-ln -sf node /usr/share/doc/node-&nodejs-version;</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--with-intl=system-icu</parameter>: use the system version
-      of <application>icu</application>. Other values are
-      <option>full-icu</option> (to build a local, full
-      <application>icu</application> library) and <option>small-icu</option>
-      (to build a local, minimal <application>icu</application> library).
-    </para>
-
-    <para>
-      <parameter>--shared-{brotli,cares,libuv,nghttp2,openssl,zlib}</parameter>:
-      use the system installed libraries instead of local copies.
-    </para>
-
-    <para>
-      <option>--without-npm</option>: do not build
-      <application>npm</application> (use if you'd like to build a separate
-      <application>npm</application> later).
-    </para>
-
-    <para>
-      <option>--shared-http-parser</option>: use the system
-      installed library instead of a local copy.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          corepack, node, npm, and npx
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/include/node,
-          /usr/lib/node_modules/{corepack,npm},
-          /usr/share/doc/{node,node-&nodejs-version;}, and
-          /usr/share/systemtap/tapset
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="corepack">
-        <term><command>corepack</command></term>
-        <listitem>
-          <para>
-            is an experimental tool to help with managing versions of package
-            managers.
-          </para>
-          <indexterm zone="nodejs corepack">
-            <primary sortas="b-corepack">corepack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="node">
-        <term><command>node</command></term>
-        <listitem>
-          <para>
-            is the server-side JavaScript runtime
-          </para>
-          <indexterm zone="nodejs node">
-            <primary sortas="b-node">node</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="npm">
-        <term><command>npm</command></term>
-        <listitem>
-          <para>
-            is the <application>Node.js</application> package manager
-          </para>
-          <indexterm zone="nodejs npm">
-            <primary sortas="b-npm">npm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term>
-          <filename class="directory">/usr/lib/node_modules/npm/</filename>
-        </term>
-        <listitem>
-          <para>
-            is the installation root for Node.js executables and libraries
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/npth.xml
===================================================================
--- general/genlib/npth.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,170 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 npth-download-http "&gnupg-http;/npth/npth-&npth-version;.tar.bz2">
-  <!ENTITY npth-download-ftp  " ">
-  <!ENTITY npth-md5sum        "286274d0106ec408efebe4a399975b11">
-  <!ENTITY npth-size          "308 KB">
-  <!ENTITY npth-buildsize     "2.6 MB (with checks)">
-  <!ENTITY npth-time          "less than 0.1 SBU (with checks)">
-]>
-
-<sect1 id="npth" xreflabel="npth-&npth-version;">
-  <?dbhtml filename="npth.html"?>
-
-
-  <title>npth-&npth-version;</title>
-
-  <indexterm zone="npth">
-    <primary sortas="a-NPth">NPth</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NPth</title>
-
-    <para>
-      The <application>NPth</application> package contains a very portable
-      POSIX/ANSI-C based library for Unix platforms which provides
-      non-preemptive priority-based scheduling for multiple threads of
-      execution (multithreading) inside event-driven applications. All threads
-      run in the same address space of the server application, but each thread
-      has its own individual program-counter, run-time stack, signal mask and
-      errno variable.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&npth-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&npth-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &npth-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &npth-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &npth-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &npth-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NPth</title>
-
-    <para>
-      Install <application>NPth</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-<!--
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#$(LOBJS) ...</command>: This <command>sed</command>
-      fixes a race condition in the <filename>Makefile</filename>. It allows
-      running <command>make</command> with multiple jobs (e.g., <command>make
-      -j4</command>).
-    </para>
-
-    <para>
-      <option>-\-disable-static</option>: This option stops it compiling a
-      static version of the library.
-    </para>
-
-    <para>
-      <option>-\-mandir=/usr/share/man</option>: This option puts the man
-      pages in <filename class="directory">/usr/share/man</filename> and not
-      <filename class="directory">/usr/man</filename>.
-    </para>
-  </sect2>-->
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>npth-config</seg>
-        <seg>libnpth.so</seg>
-        <seg>None</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="npth-config">
-        <term><command>npth-config</command></term>
-        <listitem>
-          <para>
-            is a utility used to configure and build applications based on
-            the npth 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 npth library
-          </para>
-          <indexterm zone="npth npth-config">
-            <primary sortas="b-npth-config">npth-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnpth">
-        <term><filename class="libraryfile">libnpth.so</filename></term>
-        <listitem>
-          <para>
-            contains the API functions used by the New Portable Threads
-            Library
-          </para>
-          <indexterm zone="npth libnpth">
-            <primary sortas="c-libnpth">libnpth.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/nspr.xml
===================================================================
--- general/genlib/nspr.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 nspr-download-http "&mozilla-http;/nspr/releases/v&nspr-version;/src/nspr-&nspr-version;.tar.gz">
-  <!ENTITY nspr-download-ftp  " ">
-  <!ENTITY nspr-md5sum        "5e0acf9fbdde85181bddd510f4624841">
-  <!ENTITY nspr-size          "1.0 MB">
-  <!ENTITY nspr-buildsize     "9.6 MB">
-  <!ENTITY nspr-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="nspr" xreflabel="NSPR-&nspr-version;">
-  <?dbhtml filename="nspr.html"?>
-
-
-  <title>NSPR-&nspr-version;</title>
-
-  <indexterm zone="nspr">
-    <primary sortas="a-NSPR">NSPR</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to NSPR</title>
-
-    <para>
-      <application>Netscape Portable Runtime</application> (NSPR) provides a
-      platform-neutral API for system level and libc like functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&nspr-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&nspr-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &nspr-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-         Download size: &nspr-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &nspr-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &nspr-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of NSPR</title>
-
-    <para>
-      Install <application>NSPR</application> by running the following commands:
-    </para>
-
-<screen><userinput>cd nspr &amp;&amp;
-
-sed -i '/^RELEASE/s|^|#|' pr/src/misc/Makefile.in &amp;&amp;
-sed -i 's|$(LIBRARY) ||'  config/rules.mk         &amp;&amp;
-
-./configure --prefix=/usr   \
-            --with-mozilla  \
-            --with-pthreads \
-            $([ $(uname -m) = x86_64 ] &amp;&amp; echo --enable-64bit) &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      The test suite is designed for testing changes to nss or nspr and is
-      not particularly useful for checking a released version (e.g. it needs
-      to be run on a non-optimized build with both nss and nspr directories
-      existing alongside each other). For further details, see the Editor Notes
-      for nss at <ulink url="&blfs-wiki;/nss"/>
-    </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>
-      <command>sed -ri '/^RELEASE/s/^/#/' pr/src/misc/Makefile.in</command>:
-      This sed disables installing two unneeded scripts.
-    </para>
-
-    <para>
-      <command>sed -i 's#$(LIBRARY) ##' config/rules.mk</command>: This sed disables
-      installing the static libraries.
-    </para>
-
-    <para>
-      <parameter>--with-mozilla</parameter>: This parameter adds Mozilla support
-      to the libraries (required if you want to build any other Mozilla
-      products and link them to these libraries).
-    </para>
-
-    <para>
-      <parameter>--with-pthreads</parameter>: This parameter forces use of the
-      system pthread library.
-    </para>
-
-    <para>
-      <parameter>--enable-64bit</parameter>: The --enable-64bit parameter is
-      <emphasis>required</emphasis> on an x86_64 system to prevent
-      <command>configure</command> failing with a claim that this is a system
-      without pthread support. The [ $(uname -m) = x86_64 ] test ensures it has
-      no effect on a 32 bit system.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          nspr-config
-        </seg>
-        <seg>
-          libnspr4.so, libplc4.so, and libplds4.so
-        </seg>
-        <seg>
-          /usr/include/nspr
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nspr-config">
-        <term><command>nspr-config</command></term>
-        <listitem>
-          <para>
-            provides compiler and linker options to other packages that use
-            <application>NSPR</application>
-          </para>
-          <indexterm zone="nspr nspr-config">
-            <primary sortas="b-nspr-config">nspr-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnspr4">
-        <term><filename class="libraryfile">libnspr4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide platform independence for non-GUI
-            operating system facilities such as threads, thread synchronization,
-            normal file and network I/O, interval timing and calendar time,
-            basic memory management and shared library linking
-          </para>
-          <indexterm zone="nspr libnspr4">
-            <primary sortas="c-libnspr4">libnspr4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libplc4">
-        <term><filename class="libraryfile">libplc4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement many of the features offered by
-            libnspr4
-          </para>
-          <indexterm zone="nspr libplc4">
-            <primary sortas="c-libplc4">libplc4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libplds4">
-        <term><filename class="libraryfile">libplds4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide data structures
-          </para>
-          <indexterm zone="nspr libplds4">
-            <primary sortas="c-libplds4">libplds4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/openssl.xml
===================================================================
--- general/genlib/openssl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="openssl" xreflabel="openssl-&openssl-version;">
+<?dbhtml filename="openssl.html" dir="general"?>
+<title>openssl-&openssl-version;</title>
+
+&openssl-intro;
+&openssl-inst;
+&openssl-exp;
+&openssl-config;
+&openssl-desc;
+
+</sect1>
Index: general/genlib/openssl/openssl-config.xml
===================================================================
--- general/genlib/openssl/openssl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,18 @@
+<sect2>
+<title>Configuring Openssl</title>
+
+<sect3><title>Config files</title>
+<para><userinput>/etc/ssl/openssl.cnf</userinput></para>
+</sect3>
+
+<sect3><title>Configuration Information</title>
+
+<para>Most people who just want to use openssl for providing functions
+to other programs such as OpenSSH and web browsers won't need to worry
+about configuring openssl.  Configuring openssl is an advanced topic and
+so those who do would normally be expected to either know how to do it
+or to be able to find out how to do it.</para>
+</sect3>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-desc.xml
===================================================================
--- general/genlib/openssl/openssl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,47 @@
+<sect2>
+<title>Contents</title>
+
+<para>The openssl package contains <userinput>c_rehash</userinput>,
+<userinput>openssl</userinput>, <userinput>libcrypto</userinput> and
+<userinput>libssl</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>c_rehash</title>
+
+<para>No description is available for c_rehash.</para>
+
+</sect3>
+
+<sect3><title>openssl</title>
+
+<para>The openssl program is a command line tool for using the various
+cryptography functions of OpenSSL's crypto library from the shell.  
+It can be used for various functions which are documented in
+<userinput>man 1 openssl</userinput>.</para>
+
+</sect3>
+
+<sect3><title>libcrypto</title>
+
+<para>The OpenSSL crypto library implements a wide range of cryptographic 
+algorithms used in various Internet standards. The services provided by 
+this library are used by the OpenSSL implementations of SSL, TLS and S/MIME, 
+and they have also been used to implement SSH, OpenPGP, and other 
+cryptographic standards.</para>
+
+</sect3>
+
+<sect3><title>libssl</title>
+ 
+<para>The OpenSSL ssl library implements the Secure Sockets Layer (SSL 
+v2/v3) and Transport Layer Security (TLS v1) protocols. It provides a rich 
+API, documentation on which can be found by running 
+<userinput>man 3 ssl</userinput>.</para>
+ 
+</sect3>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-exp.xml
===================================================================
--- general/genlib/openssl/openssl-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,20 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>mv doc/apps/passwd.pod
+doc/apps/openssl-passwd.pod :</userinput> We do this because otherwise
+openssl installs it's passwd man page over the existing system one which
+isn't what we want.</para>
+
+<para><screen><userinput>make MANDIR=/usr/share/man</userinput>
+<userinput>make MANDIR=/usr/share/man install :</userinput></screen> These
+commands install openssl with the man pages in /usr/share/man instead of
+the default which is /etc/ssl/man.</para>
+ 
+<para><userinput>rmdir /etc/ssl/lib :</userinput> This is simply a
+tidy-up command.  For some reason, the openssl install routine creates
+the /etc/ssl/lib directory even though the libraries have been installed
+in /usr/lib.  We remove it to keep things nice and tidy!</para>
+
+</sect2>
+
Index: general/genlib/openssl/openssl-inst.xml
===================================================================
--- general/genlib/openssl/openssl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,21 @@
+<sect2>
+<title>Installation of openssl</title>
+
+<para>Install openssl by running the following commands:</para>
+
+<note><para>GCC issues a warning on every compilation because the Configure 
+command uses -m486 instead of -march=i486.  To fix this behavior, 
+change the definition on line 337 of Configure.  The line begins with "linux-elf". 
+</para></note>
+
+<para><screen><userinput>mv doc/apps/passwd.pod doc/apps/openssl-passwd.pod &amp;&amp;
+./Configure linux-elf  --openssldir=/etc/ssl --prefix=/usr shared &amp;&amp;</userinput>
+<userinput>make MANDIR=/usr/share/man &amp;&amp;</userinput>
+<userinput>make MANDIR=/usr/share/man install &amp;&amp;</userinput>
+<userinput>rmdir /etc/ssl/lib</userinput>
+</screen>
+</para>
+
+
+</sect2>
+
Index: general/genlib/openssl/openssl-intro.xml
===================================================================
--- general/genlib/openssl/openssl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Introduction to openssl</title>
+
+<screen>Download location:              <ulink url="&openssl-download;"/>
+Version used:                   &openssl-version;
+Package size:                   &openssl-size;
+Estimated Disk space required:  &openssl-buildsize;</screen>
+
+<para>The openssl package contains <userinput>c_rehash</userinput>,
+<userinput>openssl</userinput>, <userinput>libcrypto</userinput> and
+<userinput>libssl</userinput>.  These are useful for providing
+cryptography functions to other packages, notably OpenSSH and web
+browsers (for accessing secure https sites).</para>
+
+</sect2>
Index: general/genlib/openssl/openssl.ent
===================================================================
--- general/genlib/openssl/openssl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/openssl/openssl.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<!ENTITY openssl SYSTEM "../openssl.xml">
+<!ENTITY openssl-intro SYSTEM "openssl-intro.xml">
+<!ENTITY openssl-inst SYSTEM "openssl-inst.xml">
+<!ENTITY openssl-exp SYSTEM "openssl-exp.xml">
+<!ENTITY openssl-desc SYSTEM "openssl-desc.xml">
+<!ENTITY openssl-config SYSTEM "openssl-config.xml">
+<!ENTITY openssl-buildsize "23 MB">
+<!ENTITY openssl-version "0.9.6d">
+<!ENTITY openssl-download "ftp://ftp.openssl.org/source/openssl-0.9.6d.tar.gz">
+<!ENTITY openssl-size "2.0 MB">
Index: general/genlib/pcre.xml
===================================================================
--- general/genlib/pcre.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,10 @@
+<sect1 id="pcre" xreflabel="pcre-&pcre-version;">
+<?dbhtml filename="pcre.html" dir="general"?>
+<title>pcre-&pcre-version;</title>
+
+&pcre-intro;
+&pcre-inst;
+&pcre-config;
+&pcre-desc;
+
+</sect1>
Index: general/genlib/pcre/pcre-config.xml
===================================================================
--- general/genlib/pcre/pcre-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring pcre</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-desc.xml
===================================================================
--- general/genlib/pcre/pcre-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,25 @@
+<sect2>
+<title>Contents</title>
+
+<para>The pcre package contains the <userinput>pcre
+libraries</userinput>, <userinput>pcregrep</userinput>,
+<userinput>pcretest</userinput> and 
+<userinput>pcre-config</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>pcregrep</title>
+<para>pcregrep is a grep that understands perl compatible regular
+expressions.</para></sect3>
+
+<sect3><title>pcretest</title>
+<para>pcretest can test your perl compatible regular expression.</para></sect3>
+
+<sect3><title>pcre-config</title>
+<para>pcre-config is used during the compile process of programs
+linking to this library.</para></sect3>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-inst.xml
===================================================================
--- general/genlib/pcre/pcre-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of pcre</title>
+
+<para>Install pcre by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: general/genlib/pcre/pcre-intro.xml
===================================================================
--- general/genlib/pcre/pcre-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to pcre</title>
+
+<screen>Download location:              &pcre-download;
+Version used:                   &pcre-version;
+Package size:                   &pcre-size;
+Estimated Disk space required:  &pcre-buildsize;</screen>
+
+<para>The pcre package contains perl compatible regular expression
+libraries. These are useful for implementing regular expression pattern
+matching using the same syntax and semantics as Perl 5.</para>
+
+
+</sect2>
Index: general/genlib/pcre/pcre.ent
===================================================================
--- general/genlib/pcre/pcre.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/pcre/pcre.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY pcre SYSTEM "../pcre.xml">
+<!ENTITY pcre-intro SYSTEM "pcre-intro.xml">
+<!ENTITY pcre-inst SYSTEM "pcre-inst.xml">
+<!ENTITY pcre-desc SYSTEM "pcre-desc.xml">
+<!ENTITY pcre-config SYSTEM "pcre-config.xml">
+<!ENTITY pcre-buildsize "2.1 MB">
+<!ENTITY pcre-version "3.9">
+<!ENTITY pcre-download "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-3.9.tar.bz2">
+<!ENTITY pcre-size "255 KB">
Index: general/genlib/pcre2.xml
===================================================================
--- general/genlib/pcre2.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,233 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 pcre2-download-http "https://github.com/PCRE2Project/pcre2/releases/download/pcre2-&pcre2-version;/pcre2-&pcre2-version;.tar.bz2">
-  <!ENTITY pcre2-download-ftp  " ">
-  <!ENTITY pcre2-md5sum        "c8e2043cbc4abb80e76dba323f7c409f">
-  <!ENTITY pcre2-size          "1.8 MB">
-  <!ENTITY pcre2-buildsize     "20 MB (with tests)">
-  <!ENTITY pcre2-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="pcre2" xreflabel="pcre2-&pcre2-version;">
-  <?dbhtml filename="pcre2.html"?>
-
-
-  <title>PCRE2-&pcre2-version;</title>
-
-  <indexterm zone="pcre2">
-    <primary sortas="a-pcre2">PCRE2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to PCRE2</title>
-
-    <para>
-      The <application>PCRE2</application> package contains a new generation of
-      the <application>Perl Compatible Regular Expression</application>
-      libraries. These are useful for implementing regular expression pattern
-      matching using the same syntax and semantics as <application>Perl</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pcre2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pcre2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pcre2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pcre2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pcre2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pcre2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">PCRE2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> and
-      <ulink url="https://thrysoee.dk/editline/">libedit</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of PCRE2</title>
-
-    <para>
-      Install <application>PCRE2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr                       \
-            --docdir=/usr/share/doc/pcre2-&pcre2-version; \
-            --enable-unicode                    \
-            --enable-jit                        \
-            --enable-pcre2-16                   \
-            --enable-pcre2-32                   \
-            --enable-pcre2grep-libz             \
-            --enable-pcre2grep-libbz2           \
-            --enable-pcre2test-libreadline      \
-            --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>
-
-    <para>
-      <parameter>--enable-unicode</parameter>: This switch enables Unicode
-      support and includes the functions for handling UTF-8/16/32 character
-      strings in the library.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2-16</parameter>: This switch enables 16 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2-32</parameter>: This switch enables 32 bit
-      character support.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2grep-libz</parameter>: This switch adds support
-      for reading .gz compressed files to <application>pcre2grep</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2grep-libbz2</parameter>: This switch adds
-      support for reading .bz2 compressed files to
-      <application>pcre2grep</application>.
-    </para>
-
-    <para>
-      <parameter>--enable-pcre2test-libreadline</parameter>: This switch adds
-      line editing and history features to the
-      <application>pcre2test</application> program.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <parameter>--enable-jit</parameter>: this option enables Just-in-time
-      compiling, which can greatly speed up pattern matching.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          pcre2-config,
-          pcre2grep,
-          and pcre2test.
-        </seg>
-        <seg>
-          libpcre2-8.so,
-          libpcre2-16.so,
-          libpcre2-32.so,
-          and libpcre2-posix.so
-        </seg>
-        <seg>
-          /usr/share/doc/pcre2-&pcre2-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pcre2grep">
-        <term><command>pcre2grep</command></term>
-        <listitem>
-          <para>
-            is a version of <application>grep</application>
-            that understands
-            <application>Perl compatible regular expressions.</application>
-          </para>
-          <indexterm zone="pcre2 pcre2grep">
-            <primary sortas="b-pcre2grep">pcre2grep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre2test">
-        <term><command>pcre2test</command></term>
-        <listitem>
-          <para>
-            can test a
-            <application>Perl compatible regular expression.</application>
-          </para>
-          <indexterm zone="pcre2 pcre2test">
-            <primary sortas="b-pcre2test">pcre2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcre2-config">
-        <term><command>pcre2-config</command></term>
-        <listitem>
-          <para>
-            outputs compilation information to programs linking against the
-            <application>PCRE2</application> libraries
-          </para>
-          <indexterm zone="pcre2 pcre2-config">
-            <primary sortas="b-pcre2-config">pcre2-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ general/genlib/popt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,173 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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;
+<sect1 id="popt" xreflabel="popt">
+<?dbhtml filename="popt.html" dir="general"?>
+<title>popt</title>
 
-  <!ENTITY popt-download-http "http://ftp.rpm.org/popt/releases/popt-1.x/popt-&popt-version;.tar.gz">
-  <!ENTITY popt-download-ftp  " ">
-  <!ENTITY popt-md5sum        "eaa2135fddb6eb03f2c87ee1823e5a78">
-  <!ENTITY popt-size          "584 KB">
-  <!ENTITY popt-buildsize     "6.9 MB (includes installing documentation and tests)">
-  <!ENTITY popt-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="popt" xreflabel="popt-&popt-version;">
-  <?dbhtml filename="popt.html"?>
-
-
-  <title>Popt-&popt-version;</title>
-
-  <indexterm zone="popt">
-    <primary sortas="a-Popt">Popt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Popt</title>
-
-    <para>
-      The <application>popt</application> package contains the
-      <application>popt</application> libraries which are used by
-      some programs to parse command-line options.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&popt-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&popt-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &popt-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &popt-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &popt-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &popt-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">popt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for generating documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Popt</title>
-
-    <para>
-      Install <application>popt</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you have <xref linkend="doxygen"/> installed and wish to build
-      the API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>sed -i 's@\./@src/@' Doxyfile &amp;&amp;
-doxygen</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>
-
-    <para>
-      If you built the API documentation, install it using the following
-      commands issued by the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>install -v -m755 -d /usr/share/doc/popt-&popt-version; &amp;&amp;
-install -v -m644 doxygen/html/* /usr/share/doc/popt-&popt-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"/>
-
-    <!-- FIXME Removed due to merged-/usr changes
-    <para>
-      <command>mv /usr/lib/libpopt.so.* /lib</command> and
-      <command>ln -sfv ...</command>: Moves the popt library on the root
-      filesystem, so it is available in case
-      <systemitem class="filesystem">/usr</systemitem> is offline and
-      <xref linkend="efibootmgr"/> is installed and linked to popt.
-    </para>
-    -->
-
-  </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>libpopt.so</seg>
-        <seg>/usr/share/doc/popt-&popt-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpopt">
-      <term><filename class="libraryfile">libpopt.so</filename></term>
-      <listitem>
-        <para>
-          is used to parse command-line options
-        </para>
-        <indexterm zone="popt libpopt">
-          <primary sortas="c-libpopt">libpopt.so</primary>
-        </indexterm>
-      </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
+<para>TO BE DONE</para>
 
 </sect1>
Index: general/genlib/popt/popt.ent
===================================================================
--- general/genlib/popt/popt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/popt/popt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY popt SYSTEM "../popt.xml">
Index: general/genlib/protobuf-c.xml
===================================================================
--- general/genlib/protobuf-c.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 protobuf-c-download-http "https://github.com/protobuf-c/protobuf-c/releases/download/v&protobuf-c-version;/protobuf-c-&protobuf-c-version;.tar.gz">
-  <!ENTITY protobuf-c-md5sum        "03030a3994b9f89ef166336048992484">
-  <!ENTITY protobuf-c-size          "496 KB">
-  <!ENTITY protobuf-c-buildsize     "60 MB">
-  <!ENTITY protobuf-c-time          "0.6 SBU">
-]>
-
-<sect1 id="protobuf-c" xreflabel="Protobuf-c-&protobuf-c-version;">
-  <?dbhtml filename="protobuf-c.html"?>
-
-  <title>Protobuf-c-&protobuf-c-version;</title>
-
-  <indexterm zone="protobuf-c">
-    <primary sortas="a-protobuf-c">Protobuf-c</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Protobuf-c</title>
-
-    <para>
-      The <application>Protobuf-c</application> package contains an
-      implementation of the Google Protocol Buffers data serialization format
-      in C.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&protobuf-c-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &protobuf-c-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &protobuf-c-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &protobuf-c-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &protobuf-c-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/protobuf-c-&protobuf-c-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Protobuf-c Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="protobuf"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Protobuf-c</title>
-
-    <para>
-      First, apply some upstream fixes to make this package compatible 
-      with protobuf-26.1:
-    </para>
-
-    <screen role="pre"><userinput>patch -Np1 -i ../protobuf-c-&protobuf-c-version;-consolidated_fixes-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Protobuf-c</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 &root; 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 Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          protoc-gen-c and protoc-c (symlinked to protoc-gen-c)
-        </seg>
-        <seg>
-          libprotobuf-c.so
-        </seg>
-        <seg>
-          /usr/include/google and
-          /usr/include/protobuf-c
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protoc-c">
-        <term><command>protoc-c</command></term>
-        <listitem>
-          <para>
-            generates C descriptor code from a .proto file
-          </para>
-          <indexterm zone="protobuf-c protoc-c">
-            <primary sortas="b-protoc-c">protoc-c</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf-c">
-        <term><filename class="libraryfile">libprotobuf-c.so</filename></term>
-        <listitem>
-          <para>
-            contains a C implementation of the Google Protocol Buffers data
-            serialization format
-          </para>
-          <indexterm zone="protobuf-c libprotobuf-c">
-            <primary sortas="c-libprotobuf-c">libprotobuf-c.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/protobuf.xml
===================================================================
--- general/genlib/protobuf.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,234 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 protobuf-download-http "https://github.com/protocolbuffers/protobuf/releases/download/v&protobuf-version;/protobuf-&protobuf-version;.tar.gz">
-  <!ENTITY protobuf-md5sum        "6ad6edec05fd08477a442db77dbebf98">
-  <!ENTITY protobuf-size          "5.7 MB">
-  <!ENTITY protobuf-buildsize     "89 MB">
-  <!ENTITY protobuf-time          "1.3 SBU (with parallelism=4)">
-]>
-
-<sect1 id="protobuf" xreflabel="Protobuf-&protobuf-version;">
-  <?dbhtml filename="protobuf.html"?>
-
-  <title>Protobuf-&protobuf-version;</title>
-
-  <indexterm zone="protobuf">
-    <primary sortas="a-protobuf">Protobuf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Protobuf</title>
-
-    <para>
-      The <application>Protobuf</application> package contains utilities and
-      libraries for using data in Google's data interchange format.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&protobuf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &protobuf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &protobuf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &protobuf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &protobuf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Protobuf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="abseil-cpp"/> and
-      <xref linkend="cmake"/>
-    </para>
-    
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://github.com/google/googletest">gtest (for tests)</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Protobuf</title>
-
-    <para>
-      Install <application>Protobuf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr      \
-      -DCMAKE_BUILD_TYPE=Release       \
-      -Dprotobuf_BUILD_TESTS=OFF       \
-      -Dprotobuf_ABSL_PROVIDER=package \
-      -Dprotobuf_BUILD_SHARED_LIBS=ON  \
-      -Dutf8_range_ENABLE_INSTALL=OFF  \
-      -G Ninja ..                      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does come with a test suite, but it requires
-      <ulink url="https://github.com/google/googletest">gtest</ulink>, which
-      is not part of BLFS.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>sed 's/utf8_range//' -i *.pc &amp;&amp;
-ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed 's/utf8_range//' -i *.pc</command>: This command removes a
-      leftover reference to libutf8_range from the pkg-config files installed
-      by this package.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_BUILD_TESTS=OFF</parameter>: This parameter prevents
-      the tests from being built because
-      <ulink url="https://github.com/google/googletest">gtest</ulink> is not
-      part of BLFS.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_ABSL_PROVIDER=package</parameter>: This parameter
-      allows the build system to use the system-installed copy of
-      <xref linkend="abseil-cpp" role="nodep"/>.
-    </para>
-
-    <para>
-      <parameter>-Dprotobuf_BUILD_SHARED_LIBS=ON</parameter>: This parameter
-      enables building shared versions of the libraries provided by this package
-      instead of static versions.
-    </para>
-
-    <para>
-      <parameter>-Dutf8_range_ENABLE_INSTALL=OFF</parameter>: This parameter
-      disables installing the utf8_range static library.  The functions
-      provided by this library and used by protobuf is already embedded into
-      <filename class='libraryfile'>libprotobuf.so</filename>, so installing
-      a full copy of the static library is just wasting the disk space.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          protoc-26.1.0 and protoc (a symlink to protoc-26.1.0)
-        </seg>
-        <seg>
-          libprotobuf.so,
-          libprotobuf-lite.so, and
-          libprotoc.so
-        </seg>
-        <seg>
-          /usr/include/google,
-          /usr/include/java,
-          /usr/include/upb_generator, and
-          /usr/lib/cmake/protobuf
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protoc">
-        <term><command>protoc</command></term>
-        <listitem>
-          <para>
-            parses protocol buffer files and generates output for several
-            programming languages and formats
-          </para>
-          <indexterm zone="protobuf protoc">
-            <primary sortas="b-protoc">protoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf">
-        <term><filename class="libraryfile">libprotobuf.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for utilizing data in Google's data interchange
-            format
-          </para>
-          <indexterm zone="protobuf libprotobuf">
-            <primary sortas="c-libprotobuf">libprotobuf.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotobuf-lite">
-        <term><filename class="libraryfile">libprotobuf-lite.so</filename></term>
-        <listitem>
-          <para>
-            contains a simpler version of the functions for utilizing data in
-            Google's data interchange format
-          </para>
-          <indexterm zone="protobuf libprotobuf-lite">
-            <primary sortas="c-libprotobuf-lite">libprotobuf-lite.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libprotoc">
-        <term><filename class="libraryfile">libprotoc.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used by protoc at runtime for outputting data
-            for several programming languages and formats
-          </para>
-          <indexterm zone="protobuf libprotoc">
-            <primary sortas="c-libprotoc">libprotoc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/qca.xml
===================================================================
--- general/genlib/qca.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,240 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 "https://download.kde.org/stable/qca/&qca-version;/qca-&qca-version;.tar.xz">
-  <!ENTITY qca-download-ftp  " ">
-  <!ENTITY qca-md5sum        "4c6348286c170b3da24820c977565d75">
-  <!ENTITY qca-size          "744 KB">
-  <!ENTITY qca-buildsize     "42 MB">
-  <!ENTITY qca-time          "0.5 SBU (using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="qca" xreflabel="qca-&qca-version;">
-  <?dbhtml filename="qca.html"?>
-
-
-  <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>
-
-    &lfs121_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">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qca-&qca-version;-openssl-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Qca Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="make-ca"/>,
-    <xref linkend="cmake"/>,
-    <xref linkend="qt6"/>, 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="p11-kit"/>,
-    <xref linkend="doxygen"/>,
-    <xref linkend="which"/>, and
-    <ulink url="https://botan.randombit.net/">Botan</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qca</title>
-
-    <para>
-      Fix the location of the CA certificates:
-    </para>
-
-<screen><userinput>sed -i 's@cert.pem@certs/ca-bundle.crt@' 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=$QT6DIR            \
-      -DCMAKE_BUILD_TYPE=Release                \
-      -DQT6=ON                                  \
-      -DQCA_MAN_INSTALL_DIR:PATH=/usr/share/man \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue <command>make test</command>. <!--One test
-      using <xref linkend="gnupg2"/> fails without a correct passphrase.  The
-      required passphrase does not seem to be published.-->
-    </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>-DQT6=ON</parameter>:
-      Ensure the packages is built with <xref linkend="qt6"/>.
-    </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-qt6 and qcatool-qt6</seg>
-        <seg>
-          libqca-qt6.so,
-          libqca-cyrus-sasl.so,
-          libqca-gcrypt.so,
-          libqca-gnupg.so,
-          libqca-logger.so,
-          libqca-nss.so,
-          libqca-ossl.so, and
-          libqca-softstore.so
-        </seg>
-        <seg>
-          &qt6-dir;/include/Qca-qt6,
-          &qt6-dir;/lib/cmake/Qca-qt6, and
-          &qt6-dir;/lib/qca-qt6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mozcerts">
-        <term><command>mozcerts-qt6</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-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcatool">
-        <term><command>qcatool-qt6</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-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqca">
-        <term><filename class="libraryfile">libqca-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is the Qt Cryptography Architecture (Qca) library
-          </para>
-          <indexterm zone="qca libqca">
-            <primary sortas="c-libqca">libqca-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/qcoro.xml
===================================================================
--- general/genlib/qcoro.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,192 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 qcoro-download-http "https://github.com/danvratil/qcoro/archive/v&qcoro-version;/qcoro-&qcoro-version;.tar.gz">
-  <!ENTITY qcoro-download-ftp  " ">
-  <!ENTITY qcoro-md5sum        "2af4e86cd77493cd41ba5ffcac33d5f4">
-  <!ENTITY qcoro-size          "148 KB">
-  <!ENTITY qcoro-buildsize     "8.4 MB (Add 19 MB for tests)">
-  <!ENTITY qcoro-time          "0.4 SBU (Add 0.5 SBU for tests)">
-]>
-
-<sect1 id="qcoro" xreflabel="qcoro-&qcoro-version;">
-  <?dbhtml filename="qcoro.html"?>
-
-  <title>qcoro-&qcoro-version;</title>
-
-  <indexterm zone="qcoro">
-    <primary sortas="b-qcoro">qcoro</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qcoro</title>
-
-    <para>
-      This package provides a set of tools to make use of C++20 coroutines with Qt.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qcoro-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qcoro-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qcoro-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qcoro-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qcoro-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qcoro-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qcoro Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt6"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qcoro</title>
-
-    <para>
-      Install <application>qcoro</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_INSTALL_PREFIX=$QT6DIR \
-      -D CMAKE_BUILD_TYPE=Release     \
-      -D BUILD_TESTING=OFF            \
-      -D QCORO_BUILD_EXAMPLES=OFF     \
-      -D BUILD_SHARED_LIBS=ON         \
-       ..                             &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test this package, remove the 'BUILD_TESTING=OFF' parameter
-      above and run:
-    </para>
-
-<screen><userinput>make test</userinput></screen>
-
-    <para>
-      Now, as the &root; 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>
-
-  </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>
-          libQCoro6Core.so,
-          libQCoro6DBus.so,
-          libQCoro6Network.so,
-          libQCoro6Qml.so,
-          libQCoro6Quick.so, and
-          libQCoro6WebSockets.so
-        </seg>
-        <seg>
-          Nine directories in $QT6DIR/lib/cmake/ and 
-          $QT6DIR/include/qcoro6
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mozcerts">
-        <term><command>mozcerts-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for converting certdata.txt into
-            outfile.pem files
-          </para>
-          <indexterm zone="qcoro mozcerts">
-            <primary sortas="b-mozcerts">mozcerts-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcorotool">
-        <term><command>qcorotool-qt6</command></term>
-        <listitem>
-          <para>
-            is a command line tool for performing various cryptographic
-            operations with qcoro
-          </para>
-          <indexterm zone="qcoro qcorotool">
-            <primary sortas="b-qcorotool">qcorotool-qt6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libqcoro">
-        <term><filename class="libraryfile">libqcoro-qt6.so</filename></term>
-        <listitem>
-          <para>
-            is the Qt Cryptography Architecture (qcoro) library
-          </para>
-          <indexterm zone="qcoro libqcoro">
-            <primary sortas="c-libqcoro">libqcoro-qt6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/slang.xml
===================================================================
--- general/genlib/slang.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/slang.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,7 @@
+<sect1 id="slang" xreflabel="slang">
+<?dbhtml filename="slang.html" dir="general"?>
+<title>slang</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
Index: general/genlib/slang/slang.ent
===================================================================
--- general/genlib/slang/slang.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/slang/slang.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY slang SYSTEM "../slang.xml">
Index: general/genlib/spidermonkey.xml
===================================================================
--- general/genlib/spidermonkey.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,425 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spidermonkey-download-http "&mozilla-http;/firefox/releases/&spidermonkey-version;esr/source/firefox-&spidermonkey-version;esr.source.tar.xz">
-  <!ENTITY spidermonkey-download-ftp  " ">
-  <!ENTITY spidermonkey-md5sum        "150ac3fe6200f01879148ef32c5dd16f">
-  <!ENTITY spidermonkey-size          "484 MB">
-  <!ENTITY spidermonkey-buildsize     "3.6 GB (40 MB installed after removing 36MB static lib; add 34 MB for the main tests and 37 MB for the jit tests)">
-  <!ENTITY spidermonkey-time          "1.9 SBU (with parallelism=4; add 1.1 SBU for the main tests and 3.7 SBU for the jit tests)">
-]>
-
-<sect1 id="spidermonkey" xreflabel="SpiderMonkey from Firefox-&spidermonkey-version;">
-  <?dbhtml filename="spidermonkey.html"?>
-
-
-  <title>SpiderMonkey from firefox-&spidermonkey-version;</title>
-
-  <indexterm zone="spidermonkey">
-    <primary sortas="a-spidermonkey">SpiderMonkey</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SpiderMonkey</title>
-
-    <para>
-      <application>SpiderMonkey</application> is Mozilla's JavaScript and
-      WebAssembly Engine, written in C++ and Rust.
-      In BLFS, the source code of SpiderMonkey is taken from Firefox.
-    </para>
-
-    <!-- To editors: make sure polkit works with mozjs when
-         tagging SpiderMonkey or upgrading it to a new major version.  -->
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spidermonkey-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spidermonkey-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spidermonkey-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spidermonkey-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spidermonkey-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spidermonkey-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/js-&JS91-version;-python_3_10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">SpiderMonkey Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="icu"/>,
-      <xref linkend="rust"/>,
-      <xref linkend="six"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <!-- If clang is installed, it will be used instead of gcc.
-           gcc does not work for 32-bit system w/o -msse2 -mfpmath=sse:
-           https://bugzilla.mozilla.org/show_bug.cgi?id=1729459 -->
-      <xref linkend="llvm"/> (with <application>Clang</application>,
-      required for 32-bit systems without SSE2 capabilities)
-    </para>
-
-    <important>
-      <para>
-        If you are building this package on a 32-bit system, and Clang
-        is not installed or you're overriding the default compiler choice
-        with the environment variable <envar>CXX</envar>, please read the
-        Command Explanations section first.
-      </para>
-    </important>
-
-    <!-- It seems nasm is only used for aarch64-win64. -->
-    <!--bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="nasm"/>
-    </para-->
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SpiderMonkey</title>
-
-    <note>
-      <para>
-        Unlike most other packages in BLFS, the instructions below require
-        you to untar
-        <filename>firefox-&spidermonkey-version;esr.tar.xz</filename> and
-        change into the <filename>firefox-&spidermonkey-version;</filename>
-        folder.
-      </para>
-
-      <para>
-        Extracting the tarball
-        will reset the permissions of the current directory to 0755 if you
-        have permission to do that. If you do this in a directory where
-        the sticky bit is set, such
-        as <filename class="directory">/tmp</filename> it will end with error
-        messages:
-      </para>
-
-<literallayout>tar: .: Cannot utime: Operation not permitted
-tar: .: Cannot change mode to rwxr-xr-t: Operation not permitted
-tar: Exiting with failure status due to previous errors
-</literallayout>
-
-      <para>
-        This does finish with non-zero status, but it does
-        <emphasis>NOT</emphasis> mean there is a real problem.
-        Do not untar as the <systemitem class="username">root</systemitem> user
-        in a directory where the sticky bit is set - that will unset it.
-      </para>
-
-    </note>
-
-    <para>
-      The building system ships several internal copies of the Python 3
-      module <filename>six.py</filename>.  The shipped copies are too old
-      to work well with Python 3.12 or later.  Replace them with the
-      symlinks to <xref linkend='six'/> already installed on the system:
-    </para>
-
-<screen><userinput>for i in $(find -name six.py); do
-  ln -sfv /usr/lib/python&python3-majorver;/site-packages/six.py $i;
-done</userinput></screen>
-
-    <para>
-      Install <application>SpiderMonkey</application> by running the following
-      commands:
-    </para>
-
-    <note>
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-         href="../../xincludes/mozshm.xml"/>
-      <para>
-        Compiling the C++ code respects $MAKEFLAGS and defaults to 'j1',
-        the rust code will use all processors.
-      </para>
-    </note>
-
-<screen><userinput>mkdir obj &amp;&amp;
-cd    obj &amp;&amp;
-
-../js/src/configure --prefix=/usr            \
-                    --disable-debug-symbols  \
-                    --disable-jemalloc       \
-                    --enable-readline        \
-                    --enable-rust-simd       \
-                    --with-intl-api          \
-                    --with-system-icu        \
-                    --with-system-zlib       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To run the SpiderMonkey test suite, issue:
-      <command>make -C js/src check-jstests
-      JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled"</command>.
-      It's recommended to redirect the output into a log.
-      <!-- recheck when ICU gets upgraded -->
-      Because we are building with system ICU, 39 tests
-      (out of a total of more than 50,000) are known to fail.
-      The test suite is executed with all CPU cores available: even in a
-      cgroup with less cores assigned, it still attempts to spawn as many
-      testing jobs as the number of <emphasis>all</emphasis> cores in the
-      system; fortunately the kernel still won't run these jobs on cores
-      not assigned to the cgroup so the CPU usage is still controlled.
-    </para>
-    <para>
-      To run the JIT test suite, issue: <command>make -C js/src
-      check-jit-test JITTEST_EXTRA_ARGS="--timeout 300"</command>.
-      Like the SpiderMonkey test suite, the number of test jobs is same as
-      the number of all CPU cores in the system even if a cgroup is used. To
-      make things worse, there are six tests each of them will use 3 GB
-      of system memory, so the peak memory usage may be up to 18 GB if the
-      number of cores is six or more.  Running the JIT test suite without
-      enough memory may invoke the kernel OOM killer and cause stability
-      issues.  If you don't have enough system memory available, append
-      <option>-jN</option> after <option>--timeout 300</option> with N
-      replaced by the number of parallel test jobs you want to start.  For
-      example, if you have 16 GB system memory available and 8 CPU cores,
-      issue <command>make -C js/src check-jit-test
-      JITTEST_EXTRA_ARGS="--timeout=300 -j5"</command> to run the test with
-      5 parallel jobs so the memory usage won't exceed 15 GB.
-      <!-- TL;DR: DO NOT REMOVE MEMORY USAGE NOTE W/O MY CONFIRMATION!
-
-           "six tests": bug1782468-ptrdiff-veclen.js, it's ran with 6
-           different configurations.
-
-           "may": this is stochasitic (like all parallelization issue),
-           don't remove the note about memory usage simply because "I cannot
-           reproduce it".
-
-           "peak": the time period using so much memory is very short, so
-           don't just watch the output of "top" or "free" with eyesight.
-           Run the test in a cgroup and read the "memory.peak" psuedo file
-           for a proper measurement.
-
-           Q: Why not just document some test failures?
-           A: This *really* can cause stability issue because the kernel
-              may OOM kill another process if the test is not ran in a
-              cgroup with memory.max set.  Even if running it in a cgroup,
-              the kernel may still OOM kill the "main" process controlling
-              the test process instead of a single test job, causing a
-              incomplete test.
-
-                                                                 - xry111
-      -->
-    </para>
-
-    <caution>
-      <para>
-        An issue in the installation process causes any running program which
-        links to SpiderMonkey shared library (for example, GNOME Shell) to
-        crash if SpiderMonkey is reinstalled, or upgraded or downgraded
-        without a change of the major version number
-        (&spidermonkey-major; in &spidermonkey-version;).  To work around
-        this issue, remove the old version of the SpiderMonkey shared
-        library before installation:
-      </para>
-
-<screen role="root"><userinput>rm -fv /usr/lib/libmozjs-&spidermonkey-major;.so</userinput></screen>
-    </caution>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-rm -v /usr/lib/libjs_static.ajs &amp;&amp;
-sed -i '/@NSPR_CFLAGS@/d' /usr/bin/js&spidermonkey-major;-config</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>--disable-debug-symbols</parameter>: Don't generate debug
-      symbols since they are very large and most users won't need it. Remove
-      it if you want to debug SpiderMonkey.
-    </para>
-
-    <para>
-      <parameter>--disable-jemalloc</parameter>: This switch disables the
-      internal memory allocator used in SpiderMonkey. jemalloc is only
-      intended for the Firefox browser environment. For other applications
-      using SpiderMonkey, the application may crash as items allocated in
-      the jemalloc allocator are freed on the system (glibc) allocator.
-    </para>
-
-    <para>
-      <parameter>--enable-readline</parameter>: This switch enables Readline
-      support in the SpiderMonkey command line interface.
-    </para>
-
-    <para>
-      <parameter>--enable-rust-simd</parameter>: This switch enables SIMD
-      optimization in the shipped encoding_rs crate.
-    </para>
-
-    <para>
-      <parameter>--with-intl-api</parameter>: This enables the
-      internationalization functions required by
-      <application>Gjs</application>.
-    </para>
-
-    <para>
-      <parameter>--with-system-*</parameter>: These parameters allow the build system
-      to use system versions of the above libraries. These are required for
-      stability.
-    </para>
-
-    <para>
-      <command>rm -v /usr/lib/libjs_static.ajs</command>: Remove a large
-      static library which is not used by any BLFS package.
-    </para>
-
-    <para>
-      <command>sed -i '/@NSPR_CFLAGS@/d'
-      /usr/bin/js&spidermonkey-major;-config</command>:
-      Prevent <command>js&spidermonkey-major;-config</command> from using
-      buggy CFLAGS.
-    </para>
-
-    <para>
-      <option><envar>CC=gcc CXX=g++</envar></option>: BLFS used to
-      prefer to use gcc and g++ instead of upstream's defaults of the
-      <application>clang</application> programs. With the release of
-      gcc-12 the build takes longer with gcc and g++, primarily because
-      of extra warnings, and is bigger. Pass these environment variables
-      to the configure script if you wish to continue to use gcc, g++
-      (by exporting them and unset them after the installation, or simply
-      prepending them before the
-      <command>../js/src/configure</command> command).  If you are
-      building on a 32-bit system, also see below.
-    </para>
-
-    <para>
-      <option><envar>CXXFLAGS="-msse2 -mfpmath=sse"</envar></option>:
-      Use SSE2 instead of 387 for double-precision floating-point
-      operations.  It's needed by GCC to satisfy the expectations of
-      upstream (Mozilla) developers with floating-point arithmetic.
-      Use it if you are building this package on a 32-bit system with
-      GCC (if Clang is not installed or GCC is explicitly specified).
-      Note that this will cause SpiderMonkey to crash on a processor without
-      SSE2 capability.  If you are running the system on such an old
-      processor, Clang is strictly needed.  This setting is not needed on
-      64-bit systems because all 64-bit x86 processors support SSE2 and the
-      64-bit compilers (both Clang and GCC) use SSE2 by default.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          js&spidermonkey-major; and js&spidermonkey-major;-config
-        </seg>
-        <seg>
-          libmozjs-&spidermonkey-major;.so
-        </seg>
-        <seg>
-          /usr/include/mozjs-&spidermonkey-major;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="js&spidermonkey-major;">
-        <term><command>js&spidermonkey-major;</command></term>
-        <listitem>
-          <para>
-            provides a command line interface to the
-            <application>JavaScript</application> engine
-          </para>
-          <indexterm zone="spidermonkey js&spidermonkey-major;">
-            <primary sortas="b-js&spidermonkey-major;">
-              js&spidermonkey-major;
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="js&spidermonkey-major;-config">
-        <term><command>js&spidermonkey-major;-config</command></term>
-        <listitem>
-          <para>
-            is used to find the SpiderMonkey compiler and linker flags
-          </para>
-          <indexterm zone="spidermonkey js&spidermonkey-major;-config">
-            <primary sortas="b-js&spidermonkey-major;-config">i
-              js&spidermonkey-major;-config
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmozjs-&spidermonkey-major;">
-        <term>
-          <filename class="libraryfile">
-            libmozjs-&spidermonkey-major;.so
-          </filename>
-        </term>
-        <listitem>
-          <para>
-            contains the Mozilla JavaScript API functions
-          </para>
-          <indexterm zone="spidermonkey libmozjs-&spidermonkey-major;">
-            <primary sortas="c-libmozjs&spidermonkey-major;">
-              libmozjs-&spidermonkey-major;.so
-            </primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/spirv-headers.xml
===================================================================
--- general/genlib/spirv-headers.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spirv-headers-download-http "https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-&spirv-headers-version;/SPIRV-Headers-&spirv-headers-version;.tar.gz">
-  <!ENTITY spirv-headers-download-ftp  " ">
-  <!ENTITY spirv-headers-md5sum        "438892138fe25c123cdacd05eb4a4b17">
-  <!ENTITY spirv-headers-size          "464 KB">
-  <!ENTITY spirv-headers-buildsize     "3.7 MB">
-  <!ENTITY spirv-headers-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="spirv-headers" xreflabel="SPIRV-Headers-&spirv-headers-version;">
-  <?dbhtml filename="spirv-headers.html"?>
-
-  <title>SPIRV-Headers-&spirv-headers-version;</title>
-
-  <indexterm zone="spirv-headers">
-    <primary sortas="a-spirv-headers">SPIRV-Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SPIRV-Headers</title>
-
-    <para>
-      The <application>SPIRV-Headers</application> package contains headers
-      that allow for applications to the SPIR-V language and instruction set
-      with Vulkan. SPIR-V is a binary intermediate language for representing
-      graphical shader stages and compute kernels for multiple Khronos APIs,
-      including OpenGL and Vulkan.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spirv-headers-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spirv-headers-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spirv-headers-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spirv-headers-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spirv-headers-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spirv-headers-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SPIRV-Headers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SPIRV-Headers</title>
-
-    <note>
-      <para>
-        This tarball
-        <filename>SPIRV-Headers-&spirv-headers-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">SPIRV-Headers-vulkan-sdk-&spirv-headers-version;</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>SPIRV-Headers</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr -G Ninja .. &amp;&amp;
-ninja</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>ninja 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>
-          None
-        </seg>
-        <seg>
-          /usr/include/spirv and
-          /usr/share/cmake/SPIRV-Headers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-</sect1>
Index: general/genlib/spirv-tools.xml
===================================================================
--- general/genlib/spirv-tools.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,321 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 spirv-tools-download-http "https://github.com/KhronosGroup/SPIRV-Tools/archive/vulkan-sdk-&spirv-tools-version;/SPIRV-Tools-&spirv-tools-version;.tar.gz">
-  <!ENTITY spirv-tools-download-ftp  " ">
-  <!ENTITY spirv-tools-md5sum        "d55af678b61667313d478db9399c09d4">
-  <!ENTITY spirv-tools-size          "3.0 MB">
-  <!ENTITY spirv-tools-buildsize     "59 MB">
-  <!ENTITY spirv-tools-time          "0.9 SBU (with tests; both using parallelism=8)">
-]>
-
-<sect1 id="spirv-tools" xreflabel="SPIRV-Tools-&spirv-tools-version;">
-  <?dbhtml filename="spirv-tools.html"?>
-
-  <title>SPIRV-Tools-&spirv-tools-version;</title>
-
-  <indexterm zone="spirv-tools">
-    <primary sortas="a-spirv-tools">SPIRV-Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to SPIRV-Tools</title>
-
-    <para>
-      The <application>SPIRV-Tools</application> package contains libraries
-      and utilities for processing SPIR-V modules.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&spirv-tools-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&spirv-tools-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &spirv-tools-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &spirv-tools-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &spirv-tools-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &spirv-tools-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">SPIRV-Tools Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="spirv-headers"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of SPIRV-Tools</title>
-
-    <note>
-      <para>
-        This tarball
-        <filename>SPIRV-Tools-&spirv-tools-version;.tar.gz</filename> will
-        extract to the directory
-        <filename class="directory">SPIRV-Tools-vulkan-sdk-&spirv-tools-version;</filename>.
-      </para>
-    </note>
-
-    <para>
-      Install <application>SPIRV-Tools</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr     \
-      -DCMAKE_BUILD_TYPE=Release      \
-      -DSPIRV_WERROR=OFF              \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DSPIRV_TOOLS_BUILD_STATIC=OFF  \
-      -DSPIRV-Headers_SOURCE_DIR=/usr \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DSPIRV_WERROR=OFF</parameter>: This switch stops the build
-      system from treating warnings as errors.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch forces the
-      build system to install shared libraries instead of static libraries.
-    </para>
-    
-    <para>
-      <parameter>-DSPIRV_TOOLS_BUILD_STATIC=OFF</parameter>: This switch
-      disables building static versions of the libraries.
-    </para>
-
-    <para>
-      <parameter>-DSPIRV-Headers_SOURCE_DIR</parameter>: This switch tells the
-      build system that <xref linkend="spirv-headers" role="nodep"/> is
-      installed in /usr. This is needed since the build system tries to use an
-      internal copy by default.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          spirv-as,
-          spirv-cfg,
-          spirv-dis,
-          spirv-lesspipe.sh,
-          spirv-link,
-          spirv-lint,
-          spirv-objdump,
-          spirv-opt,
-          spirv-reduce, and
-          spirv-val
-        </seg>
-        <seg>
-          libSPIRV-Tools-diff.so,
-          libSPIRV-Tools-link.so,
-          libSPIRV-Tools-lint.so,
-          libSPIRV-Tools-opt.so,
-          libSPIRV-Tools-reduce.so,
-          libSPIRV-Tools-shared.so, and
-          libSPIRV-Tools.so
-        </seg>
-        <seg>
-          /usr/include/spirv-tools and
-          /usr/lib/cmake/SPIRV-Tools
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="spirv-as">
-        <term><command>spirv-as</command></term>
-        <listitem>
-          <para>
-            creates a SPIR-V binary module from SPIR-V assembly text
-          </para>
-          <indexterm zone="spirv-tools spirv-as">
-            <primary sortas="b-spirv-as">spirv-as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-cfg">
-        <term><command>spirv-cfg</command></term>
-        <listitem>
-          <para>
-            shows the control flow graph in "dot" format
-          </para>
-          <indexterm zone="spirv-tools spirv-cfg">
-            <primary sortas="b-spirv-cfg">spirv-cfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-dis">
-        <term><command>spirv-dis</command></term>
-        <listitem>
-          <para>
-            disassembles a SPIR-V binary module
-          </para>
-          <indexterm zone="spirv-tools spirv-dis">
-            <primary sortas="b-spirv-dis">spirv-dis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-lesspipe.sh">
-        <term><command>spirv-lesspipe.sh</command></term>
-        <listitem>
-          <para>
-            automatically disassembles a .SPV file for 'less'
-          </para>
-          <indexterm zone="spirv-tools spirv-lesspipe.sh">
-            <primary sortas="b-spirv-lesspipe.sh">spirv-lesspipe.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-link">
-        <term><command>spirv-link</command></term>
-        <listitem>
-          <para>
-            links SPIR-V binary files together
-          </para>
-          <indexterm zone="spirv-tools spirv-link">
-            <primary sortas="b-spirv-link">spirv-link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-lint">
-        <term><command>spirv-lint</command></term>
-        <listitem>
-          <para>
-            checks a SPIR-V binary module for errors
-          </para>
-          <indexterm zone="spirv-tools spirv-lint">
-            <primary sortas="b-spirv-lint">spirv-lint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-objdump">
-        <term><command>spirv-objdump</command></term>
-        <listitem>
-          <para>
-            dumps information from a SPIR-V binary
-          </para>
-          <indexterm zone="spirv-tools spirv-objdump">
-            <primary sortas="b-spirv-objdump">spirv-objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-opt">
-        <term><command>spirv-opt</command></term>
-        <listitem>
-          <para>
-            performs optimizations on SPIR-V binary files
-          </para>
-          <indexterm zone="spirv-tools spirv-opt">
-            <primary sortas="b-spirv-opt">spirv-opt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-reduce">
-        <term><command>spirv-reduce</command></term>
-        <listitem>
-          <para>
-            reduces a SPIR-V binary file
-          </para>
-          <indexterm zone="spirv-tools spirv-reduce">
-            <primary sortas="b-spirv-reduce">spirv-reduce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="spirv-val">
-        <term><command>spirv-val</command></term>
-        <listitem>
-          <para>
-            validates a SPIR-V binary file
-          </para>
-          <indexterm zone="spirv-tools spirv-val">
-            <primary sortas="b-spirv-val">spirv-val</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSPIRV-Tools">
-        <term><filename class="libraryfile">libSPIRV-Tools.so</filename></term>
-        <listitem>
-          <para>
-            contains functions for processing SPIR-V modules
-          </para>
-          <indexterm zone="spirv-tools libSPIRV-Tools">
-            <primary sortas="c-libSPIRV-Tools">libSPIRV-Tools.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: general/genlib/talloc.xml
===================================================================
--- general/genlib/talloc.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,162 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 talloc-download-http "https://www.samba.org/ftp/talloc/talloc-&talloc-version;.tar.gz">
-  <!ENTITY talloc-download-ftp  " ">
-  <!ENTITY talloc-md5sum        "d29bdf75ce181e148c46b16a83de6d76">
-  <!ENTITY talloc-size          "664 KB">
-  <!ENTITY talloc-buildsize     "10 MB (with tests)">
-  <!ENTITY talloc-time          "0.4 SBU (with tests)">
-]>
-
-<sect1 id="talloc" xreflabel="Talloc-&talloc-version;">
-  <?dbhtml filename="talloc.html"?>
-
-
-  <title>Talloc-&talloc-version;</title>
-
-  <indexterm zone="talloc">
-    <primary sortas="a-Talloc">Talloc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Talloc</title>
-
-    <para>
-      <application>Talloc</application> provides a hierarchical, reference
-      counted memory pool system with destructors. It is the core memory
-      allocator used in <application>Samba</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&talloc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&talloc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &talloc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &talloc-size;</para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &talloc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &talloc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Talloc Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (To generate man pages),
-      <xref linkend="gdb"/>,
-      <xref linkend="git"/>,
-      <xref linkend="libnsl"/>,
-      <xref linkend="libtirpc"/>,
-      <xref linkend="valgrind"/>, and
-      <xref linkend="xfsprogs"/>
-      <!-- These are all looked for at build time, but might not actually be used.-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Talloc</title>
-
-    <para>
-      Install <application>Talloc</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To check 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>
-
-
-  </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>
-          libpytalloc-util.&python3-lib-suffix;.so,
-          libtalloc.so, and
-          talloc.&python3-lib-suffix;.so (Python 3 Module)
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtalloc">
-        <term><filename class="libraryfile">libtalloc.so</filename></term>
-        <listitem>
-          <para>
-            contains a replacement for the <application>Glibc</application>
-            malloc function
-          </para>
-          <indexterm zone="talloc libtalloc">
-            <primary sortas="c-libtalloc">libtalloc.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/telepathy-glib.xml
===================================================================
--- general/genlib/telepathy-glib.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,215 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 telepathy-glib-download-http
-           "https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-&telepathy-glib-version;.tar.gz">
-  <!ENTITY telepathy-glib-download-ftp  " ">
-  <!ENTITY telepathy-glib-md5sum        "a3a75657e9389381b44fee1680f770a7">
-  <!ENTITY telepathy-glib-size          "3.7 MB">
-  <!ENTITY telepathy-glib-buildsize     "256 MB">
-  <!ENTITY telepathy-glib-time          "1.2 SBU">
-]>
-
-<sect1 id="telepathy-glib" xreflabel="telepathy-glib-&telepathy-glib-version;">
-  <?dbhtml filename="telepathy-glib.html"?>
-
-
-  <title>telepathy-glib-&telepathy-glib-version;</title>
-
-  <indexterm zone="telepathy-glib">
-    <primary sortas="a-telepathy-glib">telepathy-glib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Telepathy GLib</title>
-
-    <para>
-      The <application>Telepathy GLib</application> contains a library used by
-      <application>GLib</application> based <application>Telepathy</application>
-      components. Telepathy is a <application>D-Bus</application> framework for
-      unifying real time communication, including instant messaging, voice calls
-      and video calls. It abstracts differences between protocols to provide a
-      unified interface for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&telepathy-glib-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&telepathy-glib-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &telepathy-glib-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &telepathy-glib-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &telepathy-glib-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &telepathy-glib-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/telepathy-glib-&telepathy-glib-version;-consolidated_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">Telepathy GLib Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus-glib"/> and
-      <xref linkend="libxslt"/>
-    </para>
-
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Telepathy Glib</title>
-
-<!--
-    <para>
-      First, apply a patch to fix several bugs discovered after
-      release:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../telepathy-glib-&telepathy-glib-version;-consolidated_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      If you intend to run the tests, one of them defaults to invoking
-      <filename>/usr/bin/python</filename> and fails if it is absent, causing
-      the second batch of tests to not run - unlike the other tests which can be
-      overridden from the environment. Fix it with the following command:
-    </para>
-    <!-- Still needed with 0.24.2 -->
-
-<screen><userinput>sed -i 's%/usr/bin/python%&amp;3%' tests/all-errors-documented.py</userinput></screen>
-
-    <para>
-      Install <application>Telepathy GLib</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>PYTHON=/usr/bin/python3 ./configure --prefix=/usr          \
-                                    --enable-vala-bindings \
-                                    --disable-static       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      <!--Four tests are known to fail: <emphasis>test-account</emphasis>,
-      <emphasis>test-cm</emphasis>, <emphasis>test-contact-lists</emphasis>, and
-      <emphasis>test-contact-list-client</emphasis>.-->
-    </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>--enable-vala-bindings</parameter>: This switch
-      enables building of the Vala bindings. Remove if you don't
-      have <xref linkend="vala"/> installed.
-    </para>
-
-    <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 Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libtelepathy-glib.so
-        </seg>
-        <seg>
-          /usr/include/telepathy-1.0 and
-          /usr/share/gtk-doc/html/telepathy-glib
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtelepathy-glib">
-        <term><filename class="libraryfile">libtelepathy-glib.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Telepathy GLib</application> API functions
-          </para>
-          <indexterm zone="telepathy-glib libtelepathy-glib">
-            <primary sortas="c-libtelepathy-glib">libtelepathy-glib.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/uchardet.xml
===================================================================
--- general/genlib/uchardet.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 uchardet-download-http "https://www.freedesktop.org/software/uchardet/releases/uchardet-&uchardet-version;.tar.xz">
-  <!ENTITY uchardet-download-ftp  " ">
-  <!ENTITY uchardet-md5sum        "9e267be7aee81417e5875086dd9d44fd">
-  <!ENTITY uchardet-size          "217 KB">
-  <!ENTITY uchardet-buildsize     "4.6 MB (with test)">
-  <!ENTITY uchardet-time          "less than 0.1 SBU (with test)">
-
-]>
-
-<sect1 id="uchardet" xreflabel="uchardet-&uchardet-version;">
-  <?dbhtml filename="uchardet.html"?>
-
-
-  <title>Uchardet-&uchardet-version;</title>
-
-  <indexterm zone="uchardet">
-    <primary sortas="a-uchardet">uchardet</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Uchardet</title>
-
-    <para>
-      The <application>Uchardet</application> package contains an encoding
-      detectory library which takes a sequence of bytes in an unknown character
-      encoding and attempts to determine the encoding of the text.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&uchardet-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&uchardet-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &uchardet-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &uchardet-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &uchardet-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &uchardet-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Uchardet Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Uchardet</title>
-
-    <para>
-      Install <application>Uchardet</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DBUILD_STATIC=OFF          \
-      -Wno-dev ..                 &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>-DBUILD_STATIC=OFF</parameter>: This switch disables building
-      the static version of the library.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          uchardet
-        </seg>
-        <seg>
-          libuchardet.so
-        </seg>
-        <seg>
-          /usr/include/uchardet
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="uchardet-prog">
-        <term><command>uchardet</command></term>
-        <listitem>
-          <para>
-            detects what character set is used inside of a file
-          </para>
-          <indexterm zone="uchardet uchardet-prog">
-            <primary sortas="b-uchardet">uchardet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libuchardet">
-        <term><filename class="libraryfile">libuchardet.so</filename></term>
-        <listitem>
-          <para>
-            provides an API for detecting the encoding of text in a file
-          </para>
-          <indexterm zone="uchardet libuchardet">
-            <primary sortas="c-libuchardet">libuchardet.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/umockdev.xml
===================================================================
--- general/genlib/umockdev.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,208 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 umockdev-download-http "https://github.com/martinpitt/umockdev/releases/download/&umockdev-version;/umockdev-&umockdev-version;.tar.xz">
-  <!ENTITY umockdev-download-ftp  " ">
-  <!ENTITY umockdev-md5sum        "74342306a6d25e266dfa2a7b7695c2e1">
-  <!ENTITY umockdev-size          "484 KB">
-  <!ENTITY umockdev-buildsize     "6.8 MB (with tests)">
-  <!ENTITY umockdev-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="umockdev" xreflabel="umockdev-&umockdev-version;">
-  <?dbhtml filename="umockdev.html"?>
-
-
-  <title>Umockdev-&umockdev-version;</title>
-
-  <indexterm zone="umockdev">
-    <primary sortas="a-umockdev">umockdev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Umockdev</title>
-
-    <para>
-      The <application>Umockdev</application> package contains a framework
-      that allows a developer to mock devices for use in unit testing.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&umockdev-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&umockdev-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &umockdev-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &umockdev-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &umockdev-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &umockdev-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Umockdev Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgudev"/>,
-      <xref linkend="libpcap"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="http://www.gphoto.org/">libgphoto2</ulink> (optional for tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Umockdev</title>
-
-    <para>
-      Install <application>Umockdev</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue as the &root; user: <command>ninja test</command>.
-      One test needs to be run in an X session.
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this switch if you have
-      <xref linkend="gtk-doc" role="nodep"/> installed and wish to rebuild and
-      install the API documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-           umockdev-record,
-           umockdev-run, and
-           umockdev-wrapper
-        </seg>
-        <seg>
-          libumockdev-preload.so <!-- Only intended for use by
-          umockdev-wrapper. Don't put in a short description for this--> and
-          libumockdev.so
-        </seg>
-        <seg>
-          /usr/include/umockdev-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="umockdev-record">
-        <term><command>umockdev-record</command></term>
-        <listitem>
-          <para>
-            records Linux devices and their ancestors from sysfs/udev or
-            records ioctls for a device
-          </para>
-          <indexterm zone="umockdev umockdev-record">
-            <primary sortas="b-umockdev-record">umockdev-record</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umockdev-run">
-        <term><command>umockdev-run</command></term>
-        <listitem>
-          <para>
-            runs a program under an <application>umockdev</application>
-            testbed
-          </para>
-          <indexterm zone="umockdev umockdev-run">
-            <primary sortas="b-umockdev-run">umockdev-run</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umockdev-wrapper">
-        <term><command>umockdev-wrapper</command></term>
-        <listitem>
-          <para>
-            wraps a program around
-            <filename class="libraryfile">libumockdev-preload.so.0</filename>
-            through LD_PRELOAD
-          </para>
-          <indexterm zone="umockdev umockdev-wrapper">
-            <primary sortas="b-umockdev-wrapper">umockdev-wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libumockdev">
-        <term><filename class="libraryfile">libumockdev.so</filename></term>
-        <listitem>
-          <para>
-            provides API functions that allow mocking hardware devices for unit
-            testing
-          </para>
-          <indexterm zone="umockdev libumockdev">
-            <primary sortas="c-libumockdev">libumockdev.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: general/genlib/utfcpp.xml
===================================================================
--- general/genlib/utfcpp.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 utfcpp-download-http "https://github.com/nemtrif/utfcpp/archive/v&utfcpp-version;/utfcpp-&utfcpp-version;.tar.gz">
-  <!ENTITY utfcpp-download-ftp  " ">
-  <!ENTITY utfcpp-md5sum        "8e0fe13266a7fa02f61340bf399986c3">
-  <!ENTITY utfcpp-size          "36 KB">
-  <!ENTITY utfcpp-buildsize     "496 KB">
-  <!ENTITY utfcpp-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="utfcpp" xreflabel="utfcpp-&utfcpp-version;">
-  <?dbhtml filename="utfcpp.html"?>
-
-  <title>utfcpp-&utfcpp-version;</title>
-
-  <indexterm zone="utfcpp">
-    <primary sortas="a-utfcpp">utfcpp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to utfcpp</title>
-
-    <para>
-      The <application>utfcpp</application> package contains a set of
-      include files to provide UTF-8 with C++ in a Portable Way.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&utfcpp-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&utfcpp-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &utfcpp-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &utfcpp-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &utfcpp-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &utfcpp-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">utfcpp Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of utfcpp</title>
-
-    <para>
-      Install <application>utfcpp</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr ..</userinput></screen>
-<!-- Running make does nothing -->
-
-    <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>
-          None
-        </seg>
-        <seg>
-          /usr/include/utfcpp and
-          /usr/share/utfcpp
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: general/genlib/wayland-protocols.xml
===================================================================
--- general/genlib/wayland-protocols.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wayland-protocols-download-http "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/&wayland-protocols-version;/downloads/wayland-protocols-&wayland-protocols-version;.tar.xz">
-  <!ENTITY wayland-protocols-download-ftp  " ">
-  <!ENTITY wayland-protocols-md5sum        "cd0f2a1ab6e54568e4f856f140dedca9">
-  <!ENTITY wayland-protocols-size          "96 KB">
-  <!ENTITY wayland-protocols-buildsize     "8.9 MB (with tests)">
-  <!ENTITY wayland-protocols-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="wayland-protocols" xreflabel="wayland-protocols-&wayland-protocols-version;">
-  <?dbhtml filename="wayland-protocols.html"?>
-
-
-  <title>Wayland-Protocols-&wayland-protocols-version;</title>
-
-  <indexterm zone="wayland-protocols">
-    <primary sortas="a-wayland-protocols">wayland-protocols</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wayland-Protocols</title>
-
-    <para>
-      The <application>Wayland-Protocols</application> package contains
-      additional Wayland protocols that add functionality outside of
-      protocols already in the Wayland core.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wayland-protocols-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wayland-protocols-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wayland-protocols-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wayland-protocols-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wayland-protocols-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wayland-protocols-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wayland-protocols Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="wayland"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wayland-protocols</title>
-
-    <para>
-      Install <application>Wayland-protocols</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja 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>
-          None
-        </seg>
-        <seg>
-          /usr/share/wayland-protocols
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: general/genlib/wayland.xml
===================================================================
--- general/genlib/wayland.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wayland-download-http "https://gitlab.freedesktop.org/wayland/wayland/-/releases/&wayland-version;/downloads/wayland-&wayland-version;.tar.xz">
-  <!ENTITY wayland-download-ftp  " ">
-  <!ENTITY wayland-md5sum        "7410ab549e3928fce9381455b17b0803">
-  <!ENTITY wayland-size          "228 KB">
-  <!ENTITY wayland-buildsize     "7.4 MB (with tests)">
-  <!ENTITY wayland-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="wayland" xreflabel="Wayland-&wayland-version;">
-  <?dbhtml filename="wayland.html"?>
-
-
-  <title>Wayland-&wayland-version;</title>
-
-  <indexterm zone="wayland">
-    <primary sortas="a-Wayland">Wayland</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Wayland</title>
-
-    <para>
-      <application>Wayland</application> is a project to define a protocol
-      for a compositor to talk to its clients as well as a library
-      implementation of the protocol.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wayland-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wayland-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wayland-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wayland-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wayland-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wayland-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Wayland Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>,
-      <xref linkend="graphviz"/> and
-      <xref linkend="xmlto"/> (to build the API documentation) and
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/> and
-      <xref linkend="libxslt"/> (to build the manual pages)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Wayland</title>
-
-    <para>
-      Install <application>Wayland</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Ddocumentation=false &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      <!-- If XDG_RUNTIME_DIR is set but the value is a non-exist path,
-           19 tests will fail.  Unfortunately BLFS /etc/profile sets
-           XDG_RUNTIME_DIR but does not create it.  For now simply unset
-           the variable.  -->
-      To test the results, issue:
-      <command>env -u XDG_RUNTIME_DIR ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Ddocumentation=false</parameter>: This switch is used to
-      disable building of the API documentation. Remove it if you have
-      installed optional dependencies.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          wayland-scanner
-        </seg>
-        <seg>
-          libwayland-client.so,
-          libwayland-cursor.so,
-          libwayland-egl.so,
-          and libwayland-server.so
-        </seg>
-        <seg>
-          /usr/share/wayland
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wayland-scanner">
-        <term><command>wayland-scanner</command></term>
-        <listitem>
-          <para>
-            is a tool to generate proxy methods in wayland-client-protocol.h
-            and wayland-server-protocol.h
-          </para>
-          <indexterm zone="wayland wayland-scanner">
-            <primary sortas="b-wayland-scanner">wayland-scanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-client">
-        <term><filename class="libraryfile">libwayland-client.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for writing <application>Wayland</application>
-            applications
-          </para>
-          <indexterm zone="wayland libwayland-client">
-            <primary sortas="c-libwayland-client">libwayland-client.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-cursor">
-        <term><filename class="libraryfile">libwayland-cursor.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for managing cursors in <application>Wayland</application>
-            applications
-          </para>
-          <indexterm zone="wayland libwayland-cursor">
-            <primary sortas="c-libwayland-cursor">libwayland-cursor.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-egl">
-        <term><filename class="libraryfile">libwayland-egl.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling OpenGL calls in
-            <application>Wayland</application> applications
-          </para>
-          <indexterm zone="wayland libwayland-egl">
-            <primary sortas="c-libwayland-egl">libwayland-egl.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwayland-server">
-        <term><filename class="libraryfile">libwayland-server.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for writing <application>Wayland</application>
-            compositors
-          </para>
-          <indexterm zone="wayland libwayland-server">
-            <primary sortas="c-libwayland-server">libwayland-server.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/wv.xml
===================================================================
--- general/genlib/wv.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,164 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 wv-download-http   "&sources-anduin-http;/wv/wv-&wv-version;.tar.gz">
-  <!ENTITY wv-download-ftp    " ">
-  <!ENTITY wv-md5sum          "dbccf2e9f747e50c913b7e3d126b73f7">
-  <!ENTITY wv-size            "608 KB">
-  <!ENTITY wv-buildsize       "25 MB">
-  <!ENTITY wv-time            "0.4 SBU">
-]>
-
-<sect1 id="wv" xreflabel="wv-&wv-version;">
-  <?dbhtml filename="wv.html"?>
-
-
-  <title>wv-&wv-version;</title>
-
-  <indexterm zone="wv">
-    <primary sortas="a-Wv">Wv</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to wv</title>
-
-    <para>
-      The <application>wv</application> package contains tools for reading
-      information from an MS Word document.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&wv-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&wv-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &wv-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &wv-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &wv-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &wv-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">wv Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libgsf"/> and
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <ulink url="https://wvware.sourceforge.net/libwmf.html">libwmf</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of wv</title>
-
-    <para>
-      Install <application>wv</application> by running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not have 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>wvSummary and several other wv* programs which are deprecated in
-        favour of abiword: see
-        <ulink url="https://wvware.sourceforge.net/"/></seg>
-        <seg>libwv-1.2.so</seg>
-        <seg>/usr/share/wv</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="wv-prog">
-        <term><command>wvSummary</command></term>
-        <listitem>
-          <para>
-            displays the summary information from an MS Word document
-          </para>
-          <indexterm zone="wv wv-prog">
-            <primary sortas="b-wv">wv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwv-1.2">
-        <term><filename class="libraryfile">libwv-1.2.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to access MS Word documents
-          </para>
-          <indexterm zone="wv libwv-1.2">
-            <primary sortas="c-libwv-1.2">libwv-1.2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/xapian.xml
===================================================================
--- general/genlib/xapian.xml	(revision 7c1239569e0ccf097b5fe0a3489e78ed444fb480)
+++ 	(revision )
@@ -1,355 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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 xapian-download-http
-           "https://oligarchy.co.uk/xapian/&xapian-version;/xapian-core-&xapian-version;.tar.xz">
-  <!ENTITY xapian-download-ftp  " ">
-  <!ENTITY xapian-md5sum        "b570c2e47f157bee29584994657aafbb">
-  <!ENTITY xapian-size          "3.1 MB">
-  <!ENTITY xapian-buildsize     "144 MB (add 162 MB for tests)">
-  <!ENTITY xapian-time          "0.5 SBU (add 3.5 SBU for tests; both using parallelism=4)">
-]>
-
-<sect1 id="xapian" xreflabel="xapian-&xapian-version;">
-  <?dbhtml filename="xapian.html"?>
-
-
-  <title>Xapian-&xapian-version;</title>
-
-  <indexterm zone="xapian">
-    <primary sortas="a-xapian">xapian</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xapian</title>
-
-    <para>
-      Xapian is an open source search engine library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xapian-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xapian-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xapian-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xapian-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xapian-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xapian-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Xapian Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="valgrind"/> (for tests)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Xapian</title>
-    <!-- Interesting footnote - SSE support is only enabled on i686.
-    There seems to be some trickery involved in that. It's not essential
-    to operation on x86_64 though, so look into it at the next version of
-    xapian. -->
-
-    <para>
-      Install <application>Xapian</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr    \
-            --disable-static \
-            --docdir=/usr/share/doc/xapian-core-&xapian-version; &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      <!--
-      The regression tests are not recommended.  On a fast (3.2 GHz i7)
-      system they took over five hours and two of four tests (the valgrind
-      tests) failed.  To run the test suite anyway,
-      issue: <command>make check</command>.
-      The tests with 1.4.15 took under an hour, at 34 SBU total. Marking
-      the test suite as usable again. I had four passes and 0 failures:
-      PASS: apitest
-      PASS: internaltest
-      PASS: stemtest
-      PASS: unittest
-      I did have Valgrind installed too. -renodr -->
-      To run the test suite, 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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          copydatabase, quest, simpleexpand, simpleindex, simplesearch,
-          xapian-check, xapian-compact, xapian-config,
-          xapian-delve, xapian-metadata, xapian-pos, xapian-progsrv,
-          xapian-replicate, xapian-replicate-server and xapian-tcpsrv
-        </seg>
-        <seg>
-          libxapian.so
-        </seg>
-        <seg>
-          /usr/include/xapian,
-          /usr/lib/cmake/xapian,
-          /usr/share/doc/xapian-core-&xapian-version;, and
-          /usr/share/xapian-core
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="copydatabase">
-        <term><command>copydatabase</command></term>
-        <listitem>
-          <para>
-            performs a document-by-document copy of one or more
-            <application>Xapian</application> databases
-          </para>
-          <indexterm zone="xapian copydatabase">
-            <primary sortas="b-copydatabase">copydatabase</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="quest">
-        <term><command>quest</command></term>
-        <listitem>
-          <para>
-            is a command line tool to search through a database
-          </para>
-          <indexterm zone="xapian quest">
-            <primary sortas="b-quest">quest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleexpand">
-        <term><command>simpleexpand</command></term>
-        <listitem>
-          <para>
-            is a simple example program demonstrating query expansion
-          </para>
-          <indexterm zone="xapian simpleexpand">
-            <primary sortas="b-simpleexpand">simpleexpand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simpleindex">
-        <term><command>simpleindex</command></term>
-        <listitem>
-          <para>
-            indexes each paragraph of a text file as a
-            <application>Xapian</application> document
-          </para>
-          <indexterm zone="xapian simpleindex">
-            <primary sortas="b-simpleindex">simpleindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="simplesearch">
-        <term><command>simplesearch</command></term>
-        <listitem>
-          <para>
-            is a simple command line search utility
-          </para>
-          <indexterm zone="xapian simplesearch">
-            <primary sortas="b-simplesearch">simplesearch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-check">
-        <term><command>xapian-check</command></term>
-        <listitem>
-          <para>
-            checks the consistency of a database or table
-          </para>
-          <indexterm zone="xapian xapian-check">
-            <primary sortas="b-xapian-check">xapian-check</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!--
-      <varlistentry id="xapian-chert-update">
-        <term><command>xapian-chert-update</command></term>
-        <listitem>
-          <para>
-            update a chert database to the new format keys.
-          </para>
-          <indexterm zone="xapian xapian-chert-update">
-            <primary sortas="b-xapian-chert-update">xapian-chert-update</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      No longer installed in 1.4.15. - renodr
-      -->
-
-      <varlistentry id="xapian-compact">
-        <term><command>xapian-compact</command></term>
-        <listitem>
-          <para>
-            compacts a database, or merges and compacts several databases
-          </para>
-          <indexterm zone="xapian xapian-compact">
-            <primary sortas="b-xapian-compact">xapian-compact</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-config">
-        <term><command>xapian-config</command></term>
-        <listitem>
-          <para>
-            reports information about the installed version of xapian
-          </para>
-          <indexterm zone="xapian xapian-config">
-            <primary sortas="b-xapian-config">xapian-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-delve">
-        <term><command>xapian-delve</command></term>
-        <listitem>
-          <para>
-            inspects the contents of a <application>Xapian</application>
-            database
-          </para>
-          <indexterm zone="xapian xapian-delve">
-            <primary sortas="b-xapian-delve">xapian-delve</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-metadata">
-        <term><command>xapian-metadata</command></term>
-        <listitem>
-          <para>
-            reads and writes user metadata
-          </para>
-          <indexterm zone="xapian xapian-metadata">
-            <primary sortas="b-xapian-metadata">xapian-metadata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-pos">
-        <term><command>xapian-pos</command></term>
-        <listitem>
-          <para>
-            inspects the contents of a flint table for development or debugging
-          </para>
-          <indexterm zone="xapian xapian-pos">
-            <primary sortas="b-xapian-pos">xapian-pos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-progsrv">
-        <term><command>xapian-progsrv</command></term>
-        <listitem>
-          <para>
-            is a remote server for use with <application>ProgClient</application>
-          </para>
-          <indexterm zone="xapian xapian-progsrv">
-            <primary sortas="b-xapian-progsrv">xapian-progsrv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-replicate">
-        <term><command>xapian-replicate</command></term>
-        <listitem>
-          <para>
-            replicates a database from a master server to a local copy
-          </para>
-          <indexterm zone="xapian xapian-replicate">
-            <primary sortas="b-xapian-replicate">xapian-replicate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-replicate-server">
-        <term><command>xapian-replicate-server</command></term>
-        <listitem>
-          <para>
-            services database replication requests from clients
-          </para>
-          <indexterm zone="xapian xapian-replicate-server">
-            <primary sortas="b-xapian-replicate-server">xapian-replicate-server</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xapian-tcpsrv">
-        <term><command>xapian-tcpsrv</command></term>
-        <listitem>
-          <para>
-            is the TCP daemon for use with <application>Xapian</application>'s
-            remote backend
-          </para>
-          <indexterm zone="xapian xapian-tcpsrv">
-            <primary sortas="b-xapian-tcpsrv">xapian-tcpsrv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/genlib/zlib.xml
===================================================================
--- general/genlib/zlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ general/genlib/zlib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect1 id="zlib" xreflabel="zlib-&zlib-version;">
+<?dbhtml filename="zlib.html" dir="general"?>
+<title>zlib-&zlib-version;</title>
+
+<para>Zlib provides compression and decompression functions to programs.
+Most people will want zlib because both servers and clients are 
+likely to need the openssl libraries which in turn require zlib.
+Servers will want openssl because it is needed for running OpenSSH services and
+clients because most web browsers need it to deal with https (secure)
+websites.</para>
+
+&zlib-intro;
+&zlib-inst;
+&zlib-exp;
+&zlib-config;
+&zlib-desc;
+
+</sect1>
+
