Index: x/lib/at-spi2-core.xml
===================================================================
--- x/lib/at-spi2-core.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,264 +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 at-spi2-core-download-http
-           "&gnome-download-http;/at-spi2-core/2.52/at-spi2-core-&at-spi2-core-version;.tar.xz">
-  <!ENTITY at-spi2-core-download-ftp  " ">
-  <!ENTITY at-spi2-core-md5sum        "e6591545b2bf204fe9a58f777bd0b78a">
-  <!ENTITY at-spi2-core-size          "564 KB">
-  <!ENTITY at-spi2-core-buildsize     "15 MB (with tests)">
-  <!ENTITY at-spi2-core-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="at-spi2-core" xreflabel="at-spi2-core-&at-spi2-core-version;">
-  <?dbhtml filename="at-spi2-core.html"?>
-
-
-  <title>at-spi2-core-&at-spi2-core-version;</title>
-
-  <indexterm zone="at-spi2-core">
-    <primary sortas="a-at-spi2-core">at-spi2-core</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to At-Spi2 Core</title>
-
-    <para>
-      The <application>At-Spi2 Core</application> package contains a
-      comprehensive accessibility framework for the Assistive Technologies
-      available on the <application>GNOME</application> platform. This includes
-      a set of interfaces which are implemented by other toolkits and
-      applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&at-spi2-core-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&at-spi2-core-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &at-spi2-core-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &at-spi2-core-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &at-spi2-core-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &at-spi2-core-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">At-Spi2 Core Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="dbus"/>,
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME),
-      <!-- Reports "Cannot get the default GSettingsSchemaSource" on
-           startup w/o it. -->
-      <xref role="runtime" linkend="gsettings-desktop-schemas"/> (Runtime),
-      and <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and <xref linkend='sphinx'/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of At-Spi2 Core</title>
-
-    <para>
-      Install <application>At-Spi2 Core</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dsystemd_user_dir=/tmp &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      The test suite requires the glib schemas of the package to be
-      installed already. The tests also need to run in a graphical
-      environment.  To test the results, install the package first,
-      then issue: <command>dbus-run-session ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root" revision="systemd"><userinput>ninja install</userinput></screen>
-<screen role="root" revision="sysv"><userinput>ninja install &amp;&amp;
-rm /tmp/at-spi-dbus-bus.service</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 revision="sysv">
-      <parameter>-Dsystemd_user_dir=/tmp</parameter>: This flag puts the
-      systemd unit file in /tmp where it will be removed. SysV is unable to
-      use this file.
-    </para>
-
-    <para>
-      <option>-Ddocs=true</option>: Use this switch if you want to build the
-      documentation. Note that you must have both
-      <xref role="nodep" linkend="gi-docgen"/>
-      and <xref linkend='sphinx'/> installed on your system.
-    </para>
-
-    <!-- For when we remove gtk2 from the book:
-    <para>
-      <parameter>-Dgtk2_atk_adaptor=false</parameter>: This switch disables
-      building the GTK+-2 module for this package.
-    </para>
-    -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <!-- <seg> No user executable programs
-          at-spi-bus-launcher and at-spi2-registryd in /usr/libexec
-        </seg> -->
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatk-1.0.so,
-          libatk-bridge-2.0.so,
-          libatspi.so, and
-          /usr/lib/gtk-2.0/modules/libatk-bridge.so
-        </seg>
-        <seg>
-          /usr/include/atk-1.0,
-          /usr/include/at-spi-2.0,
-          /usr/include/at-spi2-atk,
-          /usr/lib/gnome-settings-daemon-3.0,
-          /usr/share/defaults/at-spi2, and
-          /usr/share/gtk-doc/html/libatspi (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-    <!-- Not user executable programs
-      <varlistentry id="at-spi2-registryd">
-        <term><command>at-spi2-registryd</command></term>
-        <listitem>
-          <para>
-            is the <application>At-Spi2</application> registry daemon.
-          </para>
-          <indexterm zone="at-spi2-core at-spi2-registryd">
-            <primary sortas="b-at-spi2-registryd">at-spi2-registryd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    -->
-
-      <varlistentry id="libatk-1.0">
-        <term><filename class="libraryfile">libatk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that are used by assistive technologies to
-            interact with desktop applications
-          </para>
-          <indexterm zone="at-spi2-core libatk-1.0">
-            <primary sortas="c-libatk-1.0">libatk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatk-bridge">
-        <term><filename class="libraryfile">libatk-bridge.so</filename></term>
-        <listitem>
-          <para>
-            contains the Accessibility Toolkit GTK+-2 bridge
-          </para>
-          <indexterm zone="at-spi2-core libatk-bridge">
-            <primary sortas="c-libatk-bridge">libatk-bridge.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatk-bridge-2.0">
-        <term><filename class="libraryfile">libatk-bridge-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the Accessibility Toolkit GTK+ module
-          </para>
-          <indexterm zone="at-spi2-core libatk-bridge-2.0">
-            <primary sortas="c-libatk-bridge-2.0">libatk-bridge-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libatspi">
-        <term><filename class="libraryfile">libatspi.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>At-Spi2</application> API functions
-          </para>
-          <indexterm zone="at-spi2-core libatspi">
-            <primary sortas="c-libatspi">libatspi.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/atk.xml
===================================================================
--- x/lib/atk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="ATK" xreflabel="ATK-&ATK-version;">
+<?dbhtml filename="atk.html" dir="x"?>
+<title>ATK-&ATK-version;</title>
+
+&ATK-intro;
+&ATK-inst;
+&ATK-config;
+&ATK-desc;
+
+</sect1>
+
Index: x/lib/atk/atk-config.xml
===================================================================
--- x/lib/atk/atk-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring ATK</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/atk/atk-desc.xml
===================================================================
--- x/lib/atk/atk-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The atk package contains <userinput>ATK Libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>ATK Libraries</title>
+<para>ATK Libraries contain the API used by assistive technologies in order to 
+interact with the desktop and applications.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/atk/atk-inst.xml
===================================================================
--- x/lib/atk/atk-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of ATK</title>
+
+<para>Install ATK by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/atk/atk-intro.xml
===================================================================
--- x/lib/atk/atk-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to ATK</title>
+
+<screen>Download location:              <ulink url="&ATK-download;"/>
+Version used:                   &ATK-version;
+Package size:                   &ATK-size;
+Estimated Disk space required:  &ATK-buildsize;</screen>
+
+<para>The atk package contains the ATK libraries. They are useful for
+allowing accessibility solutions to be available for all GTK2
+applications.</para>
+
+<screen>ATK depends on:
+<xref linkend="GLib2"/></screen>
+
+</sect2>
Index: x/lib/atk/atk.ent
===================================================================
--- x/lib/atk/atk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/atk/atk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY ATK SYSTEM "../atk.xml">
+<!ENTITY ATK-intro SYSTEM "atk-intro.xml">
+<!ENTITY ATK-inst SYSTEM "atk-inst.xml">
+<!ENTITY ATK-desc SYSTEM "atk-desc.xml">
+<!ENTITY ATK-config SYSTEM "atk-config.xml">
+<!ENTITY ATK-buildsize "3 MB">
+<!ENTITY ATK-version "1.0.2">
+<!ENTITY ATK-download "ftp://ftp.gtk.org/pub/gtk/v2.0/atk-1.0.2.tar.gz">
+<!ENTITY ATK-size "340 KB">
Index: x/lib/atkmm.xml
===================================================================
--- x/lib/atkmm.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 atkmm-download-http "&gnome-download-http;/atkmm/2.28/atkmm-&atkmm-version;.tar.xz">
-  <!ENTITY atkmm-download-ftp  " ">
-  <!ENTITY atkmm-md5sum        "e0f7271990c89a6c9987f215ba47bfc5">
-  <!ENTITY atkmm-size          "724 KB">
-  <!ENTITY atkmm-buildsize     "14 MB">
-  <!ENTITY atkmm-time          "0.2 SBU">
-]>
-
-<sect1 id="atkmm" xreflabel="Atkmm-&atkmm-version;">
-  <?dbhtml filename="atkmm.html"?>
-
-
-  <title>Atkmm-&atkmm-version;</title>
-
-  <indexterm zone="atkmm">
-    <primary sortas="a-Atkmm">Atkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Atkmm</title>
-
-    <para>
-      <application>Atkmm</application> is the official C++ interface for the
-      ATK accessibility toolkit library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&atkmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&atkmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &atkmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &atkmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &atkmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &atkmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Atkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/> and
-      <xref linkend="glibmm"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Atkmm</title>
-
-    <para>
-      Install <application>Atkmm</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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatkmm-1.6.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/atkmm-1.6 and
-          /usr/share/{devhelp/books/atkmm-1.6,doc/atkmm-&atkmm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatkmm-1">
-        <term><filename class="libraryfile">libatkmm-1.6.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>ATK</application> API classes
-          </para>
-          <indexterm zone="atkmm libatkmm-1">
-            <primary sortas="c-libatkmm-1">libatkmm-1.6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/atkmm2.xml
===================================================================
--- x/lib/atkmm2.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 atkmm-download-http "&gnome-download-http;/atkmm/2.36/atkmm-&atkmm2-version;.tar.xz">
-  <!ENTITY atkmm-download-ftp  " ">
-  <!ENTITY atkmm-md5sum        "8b03a39a5e3dd0d3c040ece345f7a786">
-  <!ENTITY atkmm-size          "780 KB">
-  <!ENTITY atkmm-buildsize     "11 MB">
-  <!ENTITY atkmm-time          "0.2 SBU">
-]>
-
-<sect1 id="atkmm2" xreflabel="Atkmm-&atkmm-version;">
-  <?dbhtml filename="atkmm2.html"?>
-
-
-  <title>Atkmm-&atkmm2-version;</title>
-
-  <indexterm zone="atkmm2">
-    <primary sortas="a-Atkmm2">Atkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Atkmm</title>
-
-    <para>
-      <application>Atkmm</application> is the official C++ interface for the
-      ATK accessibility toolkit library. 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="&atkmm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&atkmm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &atkmm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &atkmm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &atkmm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &atkmm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Atkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/> and
-      <xref linkend="glibmm2"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Atkmm</title>
-
-    <para>
-      Install <application>Atkmm</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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libatkmm-2.36.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/atkmm-2.36 and
-          /usr/share/{devhelp/books/atkmm-2.36,doc/atkmm-&atkmm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libatkmm-2">
-        <term><filename class="libraryfile">libatkmm-2.36.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>ATK</application> API classes
-          </para>
-          <indexterm zone="atkmm2 libatkmm-2">
-            <primary sortas="c-libatkmm-2">libatkmm-2.36.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/cairo.xml
===================================================================
--- x/lib/cairo.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,299 +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 cairo-download-http "https://www.cairographics.org/releases/cairo-&cairo-version;.tar.xz">
-  <!--<!ENTITY cairo-download-http "https://www.cairographics.org/snapshots/cairo-&cairo-version;.tar.xz">
-  <!ENTITY cairo-download-http "&sources-anduin-http;/cairo/cairo-&cairo-version;.tar.xz">-->
-  <!ENTITY cairo-download-ftp  " ">
-  <!ENTITY cairo-md5sum        "3f0685fbadc530606f965b9645bb51d9">
-  <!ENTITY cairo-size          "32 MB">
-  <!ENTITY cairo-buildsize     "98 MB">
-  <!ENTITY cairo-time          "0.3 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="cairo" xreflabel="Cairo-&cairo-version;">
-  <?dbhtml filename="cairo.html"?>
-
-
-  <title>Cairo-&cairo-version;</title>
-
-  <indexterm zone="cairo">
-    <primary sortas="a-Cairo">Cairo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Cairo</title>
-
-    <para>
-      <application>Cairo</application> is a 2D graphics library with support for
-      multiple output devices. Currently supported output targets include the
-      <application>X</application> Window System, Win32, image buffers,
-      PostScript, PDF and SVG. Experimental backends include OpenGL, Quartz and
-      XCB file output. <application>Cairo</application> is designed to produce
-      consistent output on all output media while taking advantage of display
-      hardware acceleration when available (e.g., through the X Render
-      Extension). The <application>Cairo</application> API provides operations
-      similar to the drawing operators of PostScript and PDF. Operations in
-      <application>Cairo</application> include stroking and filling cubic
-      B&eacute;zier splines, transforming and compositing translucent images,
-      and antialiased text rendering. All drawing operations can be transformed
-      by any
-      <ulink url="https://en.wikipedia.org/wiki/Affine_transformation">affine
-      transformation</ulink> (scale, rotation, shear, etc.).
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairo-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairo-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairo-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairo-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairo-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairo-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Cairo Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libpng"/> and
-      <xref linkend="pixman"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="fontconfig"/>,
-      <xref linkend="glib2"/> (required for most GUIs), and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <!--<xref linkend="cogl"/>,-->
-      <xref linkend="gs"/>,
-      <xref linkend="gtk3"/> and <xref linkend="gtk2"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libdrm"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libxml2"/>,
-      <xref linkend="lzo"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="poppler"/>,
-      <!--&qt5-deps;,-->
-      <xref linkend="valgrind"/>,
-      <!--<ulink url="https://pkgs.fedoraproject.org/repo/pkgs/directfb/">DirectFB</ulink>,-->
-      <ulink url="https://github.com/rillian/jbig2dec/">jbig2dec</ulink>,
-      <ulink url="https://www.freedesktop.org/wiki/Software/libspectre/">libspectre</ulink>, and
-      <ulink url="https://skia.org/">Skia</ulink>
-      <!--<ulink url="https://download.qt.io/archive/qt/4.8/">Qt4</ulink>.-->
-    </para>
-
-    <note>
-      <para>
-        There is a circular dependency between cairo and harfbuzz.
-        If cairo is built before harfbuzz, it is necessary to rebuild cairo
-        after harfbuzz in order to build pango.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Cairo</title>
-
-    <!-- /usr/include/ansidecl.h says "This file is part of the GNU C
-    Library", but it's actually installed by Binutils.  -->
-<!--
-    <para>
-      Adapt this package for Binutils-2.39 or later:
-    </para>
-
-<screen><userinput>sed 's/PTR/void */' -i util/cairo-trace/lookup-symbol.c</userinput></screen>
-
-    <para>
-      Fix a pkg-config file that may cause errors later:
-    </para>
-
-<screen><userinput>sed -e "/@prefix@/a exec_prefix=@exec_prefix@" \
-    -i util/cairo-script/cairo-script-interpreter.pc.in</userinput></screen>
--->
-
-    <para>
-      Install <application>Cairo</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 have a working test suite.
-      <!-- The test suite can be run with 'ninja test', but 488 tests fail and
-      59 tests pass. This seems to be due to minute changes in the expected
-      output, similar to librsvg's tests. Since it's a huge chunk of the tests,
-      let's keep it as "broken" for now.-->
-    </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>
-
-<!-- Enabled by default in 1.18.0 (would be -Dtee=enabled otherwise)
-    <para>
-      <parameter>- -enable-tee</parameter>: This switch enables the
-      experimental tee surface backend which is required if using
-      system-installed <application>Cairo</application> with Mozilla applications.
-    </para>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <para>
-      <option>-Dxlib-xcb=enabled</option>: This switch enables several
-      experimental Xlib/XCB functions used by some window managers.
-    </para>
-
-<!-- Removed in 1.18.0
-    <para>
-      <option>- -enable-gl</option>: This switch enables
-      <application>Cairo</application>'s experimental
-      <application>OpenGL</application> surface which
-      is required for <application>Wayland</application>
-      compositor and some other packages that are not
-      part of BLFS.
-    </para>
--->
-
-    <para>
-      <option>-Dgtk_doc=true</option>: Use this parameter if GTK-Doc is
-      installed and you wish to create and install the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          cairo-trace
-        </seg>
-        <seg>
-          libcairo.so,
-          libcairo-gobject.so, and
-          libcairo-script-interpreter.so
-        </seg>
-        <seg>
-          /usr/include/cairo and
-          /usr/lib/cairo
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cairo-trace">
-        <term><command>cairo-trace</command></term>
-        <listitem>
-          <para>
-            generates a log of all calls made by an application to
-            <application>Cairo</application>
-          </para>
-          <indexterm zone="cairo cairo-trace">
-            <primary sortas="b-cairo-trace">cairo-trace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo">
-        <term><filename class="libraryfile">libcairo.so</filename></term>
-        <listitem>
-          <para>
-            contains the 2D graphics functions required for rendering to the
-            various output targets
-          </para>
-          <indexterm zone="cairo libcairo">
-            <primary sortas="c-libcairo">libcairo.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-gobject">
-        <term><filename class="libraryfile">libcairo-gobject.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that integrate
-            <application>Cairo</application> with
-            <application>Glib</application>'s GObject type system
-          </para>
-          <indexterm zone="cairo libcairo-gobject">
-            <primary sortas="c-libcairo-gobject">libcairo-gobject.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcairo-script-interpreter">
-        <term><filename class="libraryfile">libcairo-script-interpreter.so</filename></term>
-        <listitem>
-          <para>
-            contains the script interpreter functions for executing and
-            manipulating <application>Cairo</application> execution traces
-          </para>
-          <indexterm zone="cairo libcairo-script-interpreter">
-            <primary sortas="c-libcairo-script-interpreter">libcairo-script-interpreter.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/cairomm-1.0.xml
===================================================================
--- x/lib/cairomm-1.0.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,184 +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 cairomm-1.0-download-http "https://www.cairographics.org/releases/cairomm-&cairomm-1.0-version;.tar.xz">
-  <!ENTITY cairomm-1.0-download-ftp  " ">
-  <!ENTITY cairomm-1.0-md5sum        "0974ef291d491f22df287f588580677d">
-  <!ENTITY cairomm-1.0-size          "638 KB">
-  <!ENTITY cairomm-1.0-buildsize     "9.5 MB (with tests)">
-  <!ENTITY cairomm-1.0-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="cairomm-1.0" xreflabel="libcairomm-&cairomm-1.0-version;">
-  <?dbhtml filename="cairomm-1.0.html"?>
-
-
-  <title>libcairomm-1.0 (cairomm-&cairomm-1.0-version;)</title>
-
-  <indexterm zone="cairomm-1.0">
-    <primary sortas="a-libcairomm-1.0">libcairomm-1.0</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcairomm-1.0</title>
-
-    <para>
-      The <application>libcairomm-1.0</application> package provides a C++
-      interface to <application>Cairo</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairomm-1.0-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairomm-1.0-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairomm-1.0-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairomm-1.0-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairomm-1.0-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairomm-1.0-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcairomm-1.0 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/> and
-      <xref linkend="libsigc"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> (for tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcairomm-1.0</title>
-
-    <para>
-      Install <application>Cairomm-1.0</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dbuild-tests=true  \
-      -Dboost-shared=true &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the test suite, run: <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>-Dbuild-tests=true</parameter>: This switch is for building
-      the unit tests. Remove if you have not installed <xref linkend="boost"/>.
-    </para>
-
-    <para>
-      <parameter>-Dboost-shared=true</parameter>: This switch has the package
-      use the shared version of boost libraries. It is required if you have
-      not installed the boost static libraries, and you have passed
-      <parameter>-Dbuild-tests=true</parameter>.
-    </para>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: This switch builds the
-      html documentation if doxygen is installed.
-    </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>
-          libcairomm-1.0.so
-        </seg>
-        <seg>
-          /usr/{lib,include}/cairomm-1.0 and
-          /usr/share/{devhelp/books,doc}/cairomm-1.0 (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcairomm-1">
-        <term><filename class="libraryfile">libcairomm-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cairo</application> API classes
-          </para>
-          <indexterm zone="cairomm-1.0 libcairomm-1">
-            <primary sortas="c-libcairomm-1">libcairomm-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/cairomm-1.16.xml
===================================================================
--- x/lib/cairomm-1.16.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 cairomm-1.16-download-http "https://www.cairographics.org/releases/cairomm-&cairomm-1.16-version;.tar.xz">
-  <!ENTITY cairomm-1.16-download-ftp  " ">
-  <!ENTITY cairomm-1.16-md5sum        "4c7afc4ab5177655724ea4b31794db30">
-  <!ENTITY cairomm-1.16-size          "620 KB">
-  <!ENTITY cairomm-1.16-buildsize     "25 MB (with tests)">
-  <!ENTITY cairomm-1.16-time          "0.2 SBU (with tests)">
-]>
-
-<sect1 id="cairomm-1.16" xreflabel="libcairomm-&cairomm-1.16-version;">
-  <?dbhtml filename="cairomm-1.16.html"?>
-
-
-  <title>libcairomm-1.16 (cairomm-&cairomm-1.16-version;)</title>
-
-  <indexterm zone="cairomm-1.16">
-    <primary sortas="a-libcairomm-1.16">libcairomm-1.16</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libcairomm-1.16</title>
-
-    <para>
-      The <application>libcairomm-1.16</application> package provides a C++
-      interface to <application>Cairo</application>. This version of the API
-      is needed to support gtkmm-4.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&cairomm-1.16-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&cairomm-1.16-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &cairomm-1.16-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &cairomm-1.16-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &cairomm-1.16-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &cairomm-1.16-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libcairomm-1.16 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/> and
-      <xref linkend="libsigc3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="boost"/> (for tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libcairomm-1.16</title>
-
-    <para>
-      Install <application>Cairomm-1.16</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir bld &amp;&amp;
-cd    bld &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      -Dbuild-tests=true  \
-      -Dboost-shared=true &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the test suite, run: <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>-Dbuild-tests=true</parameter>: This switch is for building
-      the unit tests. Remove if you have not installed <xref linkend="boost"/>.
-    </para>
-
-    <para>
-      <parameter>-Dboost-shared=true</parameter>: This switch has the package
-      use the shared version of boost libraries. It is required if you have
-      not installed the boost static libraries, and you have passed
-      <parameter>-Dbuild-tests=true</parameter>.
-    </para>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: This switch builds the
-      html documentation if doxygen is installed.
-    </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>
-          libcairomm-1.16.so
-        </seg>
-        <seg>
-          /usr/{lib,include}/cairomm-1.16 and
-          /usr/share/{devhelp/books,doc}/cairomm-1.16 (optional)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libcairomm-1.16">
-        <term><filename class="libraryfile">libcairomm-1.16.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Cairo</application> API classes
-          </para>
-          <indexterm zone="cairomm-1.16 libcairomm-1.16">
-            <primary sortas="c-libcairomm-1.16">libcairomm-1.16.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/colord-gtk.xml
===================================================================
--- x/lib/colord-gtk.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,250 +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 colord-gtk-download-http "https://www.freedesktop.org/software/colord/releases/colord-gtk-&colord-gtk-version;.tar.xz">
-  <!ENTITY colord-gtk-download-ftp  " ">
-  <!ENTITY colord-gtk-md5sum        "d436740c06e42af421384f16b2a9a0a7">
-  <!ENTITY colord-gtk-size          "24 KB">
-  <!ENTITY colord-gtk-buildsize     "2.1 MB">
-  <!ENTITY colord-gtk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="colord-gtk" xreflabel="colord-gtk-&colord-gtk-version;">
-  <?dbhtml filename="colord-gtk.html"?>
-
-
-  <title>colord-gtk-&colord-gtk-version;</title>
-
-  <indexterm zone="colord-gtk">
-    <primary sortas="a-colord-gtk">colord-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Colord GTK</title>
-
-    <para>
-      The <application>Colord GTK</application> package contains
-      <application>GTK+</application> bindings for
-      <application>Colord</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&colord-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&colord-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &colord-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &colord-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &colord-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &colord-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Colord GTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="colord"/> and
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;,
-      <xref linkend="gtk4"/>, and
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="docbook-utils"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colord GTK</title>
-
-    <warning>
-      <para>
-        If building the documentation <command>ninja -j1</command> must be used.
-      </para>
-    </warning>
-
-    <para>
-      Install <application>Colord GTK</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk4=true         \
-            -Dvapi=true         \
-            -Ddocs=false        \
-            -Dman=false         \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests need to be run from an X session, and may require
-      a color profile for your primary display.
-      <!-- on an ASUS 32" IPS display, I have a color profile and it works
-           properly. On the other hand, with a Dell SP2208WFP LCD,
-           no color profile is available and the tests fail. It seems to
-           depend on the system/display. -->
-    </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>-Dvapi=true</parameter>: This switch enables
-      building of the Vala bindings. Remove this switch if you don't
-      have <xref linkend="vala" role="nodep"/> installed.
-    </para>
-
-    <para>
-      <parameter>-Dgtk4=true</parameter>: This switch enables building
-      the GTK-4 bindings for colord. Set this option to 'false' if you
-      do not have <xref linkend="gtk4" role="nodep"/> installed.
-    </para>
-
-    <para>
-      <parameter>-Ddocs=false</parameter>: This switch disables building
-      gtk-doc based documentation. Even if gtk-doc is installed, you will
-      need the namespaced versions of the Docbook XSL stylesheets.
-    </para>
-
-    <para>
-      <parameter>-Dman=false</parameter>: This switch disables generating
-      the manual pages for this package. Remove this switch if you have
-      namespaced versions of the Docbook XSL stylesheets installed.
-    </para>
-
-    <para>
-      <option>-Dgtk2=true</option>: This switch enables building
-      the GTK+-2 bindings for colord. However since gtk2 is deprecated 
-      it is not recommended to build these bindings.
-    </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>
-          cd-convert
-        </seg>
-        <seg>
-          libcolord-gtk.so, and
-          libcolord-gtk4.so
-        </seg>
-        <seg>
-          /usr/include/colord-1/colord-gtk and
-          /usr/share/gtk-doc/html/colord-gtk
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cd-convert">
-        <term><command>cd-convert</command></term>
-        <listitem>
-          <para>
-            is a Color Manager Testing Tool
-          </para>
-          <indexterm zone="colord-gtk cd-convert">
-            <primary sortas="b-cd-convert">cd-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord-gtk">
-        <term><filename class="libraryfile">libcolord-gtk.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application>
-            <application>GTK+</application> bindings
-          </para>
-          <indexterm zone="colord-gtk libcolord-gtk">
-            <primary sortas="c-libcolord-gtk">libcolord-gtk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcolord-gtk4">
-        <term><filename class="libraryfile">libcolord-gtk4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Colord</application>
-            <application>GTK-4</application> bindings
-          </para>
-          <indexterm zone="colord-gtk libcolord-gtk4">
-            <primary sortas="c-libcolord-gtk4">libcolord-gtk4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/fltk.xml
===================================================================
--- x/lib/fltk.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,272 +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;
-
-  <!-- Watch directory when updating -->
-  <!ENTITY fltk-download-http "https://fltk.org/pub/fltk/&fltk-version;/fltk-&fltk-version;-source.tar.gz">
-  <!ENTITY fltk-download-ftp  " ">
-  <!ENTITY fltk-md5sum        "6e7a389f97b420bc31f99edd3522a85e">
-  <!ENTITY fltk-size          "5.4 MB">
-  <!ENTITY fltk-buildsize     "122 MB (with documentation)">
-  <!ENTITY fltk-time          "0.2 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="fltk" xreflabel="FLTK-&fltk-version;">
-  <?dbhtml filename="fltk.html"?>
-
-
-  <title>FLTK-&fltk-version;</title>
-
-  <indexterm zone="fltk">
-    <primary sortas="a-FLTK">FLTK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to FLTK</title>
-
-    <para>
-      FLTK (pronounced "fulltick") is a cross-platform C++ GUI toolkit.
-      FLTK provides modern GUI functionality and supports 3D graphics via
-      OpenGL and its built-in GLUT emulation libraries used for creating
-      graphical user interfaces for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&fltk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&fltk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &fltk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &fltk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &fltk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &fltk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">FLTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="libpng"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="desktop-file-utils"/>,
-      <xref linkend="doxygen"/>,
-      <xref linkend="glu"/>,
-      <xref linkend="mesa"/>, and
-      <xref linkend="texlive"/> (or <xref linkend="tl-installer"/>)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of FLTK</title>
-
-    <note>
-      <para>
-        The tar extraction directory is fltk-&fltk-version; and not
-        fltk-&fltk-version;-source as indicated by the tarball name.
-      </para>
-    </note>
-
-    <para>
-      Install <application>FLTK</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i -e '/cat./d' documentation/Makefile       &amp;&amp;
-
-./configure --prefix=/usr    \
-            --enable-shared  &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to create the API documentation, issue:
-    </para>
-
-<screen remap="doc"><userinput>make -C documentation html</userinput></screen>
-
-    <para>
-      The tests for the package are interactive.  To execute the tests, run
-      <command>test/unittests</command>. In addition, there are 70 other
-      executable test programs in the <filename
-      class='directory'>test</filename> directory that can be run individually.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make docdir=/usr/share/doc/fltk-&fltk-version; install</userinput></screen>
-
-    <para>
-      If desired, install some example games built as a part of the tests,
-      extra documentation and example programs.  As the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"
-        remap="doc"><userinput>make -C test          docdir=/usr/share/doc/fltk-&fltk-version; install-linux &amp;&amp;
-make -C documentation docdir=/usr/share/doc/fltk-&fltk-version; install-linux</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... documentation/Makefile</command>: Avoid installing
-      pages in <filename class='directory'>/usr/share/man/cat*</filename>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          blocks,
-          checkers,
-          fltk-config,
-          fluid, and
-          sudoku
-        </seg>
-        <seg>
-          libfltk.{a,so},
-          libfltk_forms.{a,so},
-          libfltk_gl.{a,so}, and
-          libfltk_images.{a,so}
-        </seg>
-        <seg>
-          /usr/include/FL and
-          /usr/share/doc/fltk-&fltk-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="blocks">
-        <term><command>blocks</command></term>
-        <listitem>
-          <para>
-            is a FLTK-based block elimination game
-          </para>
-          <indexterm zone="fltk blocks">
-            <primary sortas="b-blocks">blocks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="checkers">
-        <term><command>checkers</command></term>
-        <listitem>
-          <para>
-            is a FLTK-based version of the game of checkers
-          </para>
-          <indexterm zone="fltk checkers">
-            <primary sortas="b-checkers">checkers</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fltk-config">
-        <term><command>fltk-config</command></term>
-        <listitem>
-          <para>
-            is a utility script that can be used to get information about the
-            current version  of  FLTK that is installed on the system
-          </para>
-          <indexterm zone="fltk fltk-config">
-            <primary sortas="b-fltk-config">fltk-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fluid">
-        <term><command>fluid</command></term>
-        <listitem>
-          <para>
-            is an interactive GUI designer for FLTK
-          </para>
-          <indexterm zone="fltk fluid">
-            <primary sortas="b-fluid">fluid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sudoku">
-        <term><command>sudoku</command></term>
-        <listitem>
-          <para>
-            is an implementation of the popular Sudoku game
-          </para>
-          <indexterm zone="fltk sudoku">
-            <primary sortas="b-sudoku">sudoku</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfltk">
-        <term><filename class="libraryfile">libfltk.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="fltk libfltk">
-            <primary sortas="c-libfltk">libfltk.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/freeglut.xml
===================================================================
--- x/lib/freeglut.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,196 +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 freeglut-download-http
-           "&sourceforge-dl;/freeglut/freeglut-&freeglut-version;.tar.gz">
-  <!ENTITY freeglut-download-ftp " ">
-  <!ENTITY freeglut-md5sum        "f1621464e6525d0368976870cab8f418">
-  <!ENTITY freeglut-size          "404 KB">
-  <!ENTITY freeglut-buildsize     "5.7 MB">
-  <!ENTITY freeglut-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="freeglut" xreflabel="Freeglut-&freeglut-version;">
-  <?dbhtml filename="freeglut.html"?>
-
-
-  <title>Freeglut-&freeglut-version;</title>
-
-  <indexterm zone="freeglut">
-    <primary sortas="a-Freeglut">Freeglut</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Freeglut</title>
-
-    <para>
-      <application>Freeglut</application> is intended to be a 100%
-      compatible, completely opensourced clone of the GLUT library.
-      GLUT is a window system independent toolkit for writing OpenGL
-      programs, implementing a simple windowing API, which makes
-      learning about and exploring OpenGL programming very easy.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&freeglut-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&freeglut-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &freeglut-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &freeglut-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &freeglut-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &freeglut-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/freeglut-&freeglut-version;-gcc10_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Freeglut Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="mesa"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="glu"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Freeglut</title>
-<!--
-    <para>
-      First, fix an issue with multiple defined symbols exposed by GCC-10:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../freeglut-&freeglut-version;-gcc10_fix-1.patch</userinput></screen>
--->
-    <para>
-      Install <application>Freeglut</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        \
-      -DFREEGLUT_BUILD_DEMOS=OFF        \
-      -DFREEGLUT_BUILD_STATIC_LIBS=OFF  \
-      -Wno-dev .. &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>-DFREEGLUT_BUILD_DEMOS=OFF</parameter>: Disable building
-      optional demo programs.  Note that if you choose to build them, their
-      installation must be done manually.  The demo programs are limited and
-      installation is not recommended.
-    </para>
-
-    <para>
-      <parameter>-DFREEGLUT_BUILD_STATIC_LIBS=OFF</parameter>:
-      Do not build the static library.
-    </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>
-          libglut.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/FreeGLUT
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libglut">
-        <term><filename class="libraryfile">libglut.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement the OpenGL Utility
-            Toolkit
-          </para>
-          <indexterm zone="freeglut libglut">
-            <primary sortas="c-libglut">libglut.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gdk-pixbuf.xml
===================================================================
--- x/lib/gdk-pixbuf.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,290 +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 gdk-pixbuf-download-http
-           "&gnome-download-http;/gdk-pixbuf/2.42/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
-  <!ENTITY gdk-pixbuf-download-ftp  " ">
-  <!ENTITY gdk-pixbuf-md5sum        "4a62f339cb1424693fba9bb7ffef8150">
-  <!ENTITY gdk-pixbuf-size          "6.2 MB">
-  <!ENTITY gdk-pixbuf-buildsize     "36 MB (with tests)">
-  <!ENTITY gdk-pixbuf-time          "0.2 SBU (With tests; both using parallelism=4)">
-]>
-
-<sect1 id="gdk-pixbuf" xreflabel="gdk-pixbuf-&gdk-pixbuf-version;">
-  <?dbhtml filename="gdk-pixbuf.html"?>
-
-
-  <title>gdk-pixbuf-&gdk-pixbuf-version;</title>
-
-  <indexterm zone="gdk-pixbuf">
-    <primary sortas="a-gdk-pixbuf">gdk-pixbuf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gdk Pixbuf</title>
-
-    <para>
-      The <application>Gdk Pixbuf</application> package is a toolkit for image
-      loading and pixel buffer manipulation. It is used by
-      <application>GTK+ 2</application> and <application>GTK+ 3</application> to
-      load and manipulate images. In the past it was distributed as part of
-      <application>GTK+ 2</application> but it was split off into a separate
-      package in preparation for the change to <application>GTK+ 3</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gdk-pixbuf-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gdk-pixbuf-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gdk-pixbuf-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gdk-pixbuf-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gdk-pixbuf-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gdk-pixbuf-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gdk Pixbuf Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME),
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libpng"/>, and
-      <xref linkend="shared-mime-info"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="docutils"/>,
-      <xref role="runtime" linkend="librsvg"/> (runtime dependency, needed for
-         loading symbolic icons) and
-      <xref linkend="libtiff"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>
-      (to generate documentation),
-      <xref role="runtime" linkend="libavif"/>
-      (runtime dependency, needed for loading AVIF images),
-      <xref role="runtime" linkend="libjxl"/>
-      (runtime dependency, needed for loading JPEG XL images), and
-      <xref role="runtime" linkend="webp-pixbuf-loader"/>
-      (runtime dependency, needed for loading WebP images)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gdk Pixbuf</title>
-
-    <para>
-      Install <application>Gdk Pixbuf</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..            \
-      --prefix=/usr       \
-      --buildtype=release \
-      --wrap-mode=nofallback &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 "/docs_dir =/s@\$@ / 'gdk-pixbuf-&gdk-pixbuf-version;'@" -i ../docs/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                                         &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. The tests
-      make a heavy use of disk.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        should be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gdk-pixbuf-query-loaders --update-cache</userinput></screen>
-    </note>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-buildtype-release.xml"/>
-
-    <!-- gi-docgen can get installed without this, if deps exist -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nofallback.xml"/>
-
-    <!-- with 2.42.9, docutils must be installed to generate man pages.
-    Without this, you'll get the following output:
-    Program rst2man found: ../docs/meson.build:70:2: ERROR: Problem encountered:
-    No rst2man found, but man pages were explicitly enabled -->
-    <para>
-      <option>-Dman=false</option>: Use this option if you do not want to
-      generate manual pages, or if you do not want to install
-      <xref linkend="docutils" role="nodep"/>.
-    </para>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gdk-pixbuf-csource,
-          gdk-pixbuf-pixdata,
-          gdk-pixbuf-query-loaders, and
-          gdk-pixbuf-thumbnailer
-        </seg>
-        <seg>
-          libgdk_pixbuf-2.0.so
-        </seg>
-        <seg>
-          /usr/{include,lib}/gdk-pixbuf-2.0,
-          /usr/libexec/installed-tests/gdk-pixbuf,
-          /usr/share/installed-tests/gdk-pixbuf,
-          /usr/share/gtk-doc/html/gdk-pixbuf, and
-          /usr/share/thumbnailers
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gdk-pixbuf-csource">
-        <term><command>gdk-pixbuf-csource</command></term>
-        <listitem>
-          <para>
-            is a small utility that generates C code containing images, used
-            for compiling images directly into programs
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-csource">
-            <primary sortas="b-gdk-pixbuf-csource">gdk-pixbuf-csource</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="gdk-pixbuf-pixdata">
-        <term><command>gdk-pixbuf-pixdata</command></term>
-        <listitem>
-          <para>
-            is a tool used to convert GdkPixbuf to GdkPixdata
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-pixdata">
-            <primary sortas="b-gdk-pixbuf-pixdata">gdk-pixbuf-pixdata</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdk-pixbuf-query-loaders">
-        <term><command>gdk-pixbuf-query-loaders</command></term>
-        <listitem>
-          <para>
-            collects information about loadable modules for
-            <application>Gdk Pixbuf</application> and writes it
-            to the default cache file location, or to stdout
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-query-loaders">
-            <primary sortas="b-gdk-pixbuf-query-loaders">gdk-pixbuf-query-loaders</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdk-pixbuf-thumbnailer">
-        <term><command>gdk-pixbuf-thumbnailer</command></term>
-        <listitem>
-          <para>
-            creates thumbnails of pictures for use in other applications
-          </para>
-          <indexterm zone="gdk-pixbuf gdk-pixbuf-thumbnailer">
-            <primary sortas="b-gdk-pixbuf-thumbnailer">gdk-pixbuf-thumbnailer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdk_pixbuf-2">
-        <term><filename class="libraryfile">libgdk_pixbuf-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to load and render images
-          </para>
-          <indexterm zone="gdk-pixbuf libgdk_pixbuf-2">
-            <primary sortas="c-libgdk_pixbuf-2">libgdk_pixbuf-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- Split off into gdk-pixbuf-xlib
-      <varlistentry id="libgdk_pixbuf_xlib-2">
-        <term><filename class="libraryfile">libgdk_pixbuf_xlib-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions used to manipulate images and interfaces with
-            <application>Xlib</application>
-          </para>
-          <indexterm zone="gdk-pixbuf libgdk_pixbuf_xlib-2">
-            <primary sortas="c-libgdk_pixbuf_xlib-2">libgdk_pixbuf_xlib-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/glew.xml
===================================================================
--- x/lib/glew.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 glew-download-http "https://downloads.sourceforge.net/glew/glew-&glew-version;.tgz">
-  <!ENTITY glew-download-ftp  " ">
-  <!ENTITY glew-md5sum        "3579164bccaef09e36c0af7f4fd5c7c7">
-  <!ENTITY glew-size          "820 KB">
-  <!ENTITY glew-buildsize     "16 MB">
-  <!ENTITY glew-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="glew" xreflabel="GLEW-&glew-version;">
-  <?dbhtml filename="glew.html"?>
-
-
-  <title>GLEW-&glew-version;</title>
-
-  <indexterm zone="glew">
-    <primary sortas="a-GLEW">GLEW</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLEW</title>
-
-    <para>
-      <application>GLEW</application> is the OpenGL Extension Wrangler Library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glew-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glew-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glew-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glew-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glew-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glew-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">glew Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mesa"/>
-    </para>
-
-  </sect2>
-
-  <!--Required section-->
-  <sect2 role="installation">
-    <title>Installation of GLEW</title>
-
-    <para>
-      Install <application>GLEW</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i 's%lib64%lib%g' config/Makefile.linux &amp;&amp;
-sed -i -e '/glew.lib.static:/d' \
-       -e '/0644 .*STATIC/d'    \
-       -e 's/glew.lib.static//' Makefile     &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.all</userinput></screen>
-  </sect2>
-
-  <!--Optional section-->
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's%lib64%lib%g' ...</command>: This ensures that the
-      library is installed in <filename class="directory">/usr/lib</filename>.
-    </para>
-
-    <para>
-      <command>sed -i -e '/glew.lib.static:/d' ...</command>: This suppresses
-      the static library.
-    </para>
-
-    <para>
-      <command>make install.all</command>: This installs the programs as well as
-      the library.
-    </para>
-  </sect2>
-
-
-  <!--Required section-->
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          glewinfo and visualinfo
-        </seg>
-        <seg>
-          libGLEW.so
-        </seg>
-        <seg>
-          /usr/include/GL
-        </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="glewinfo">
-        <term><command>glewinfo</command></term>
-        <listitem>
-          <para>
-            provides information about the supported extensions
-          </para>
-          <indexterm zone="glew glewinfo">
-            <primary sortas="b-glewinfo">glewinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="visualinfo">
-        <term><command>visualinfo</command></term>
-        <listitem>
-          <para>
-            is an extended version of glxinfo
-          </para>
-          <indexterm zone="glew visualinfo">
-            <primary sortas="b-visualinfo">visualinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGLEW.so">
-        <term><filename class="libraryfile">libGLEW.so</filename></term>
-        <listitem>
-          <para>
-            provides functions to access OpenGL extensions
-          </para>
-          <indexterm zone="glew libGLEW.so">
-            <primary sortas="c-libGLEW.so">libGLEW.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/glslang.xml
===================================================================
--- x/lib/glslang.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,229 +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 glslang-download-http "https://github.com/KhronosGroup/glslang/archive/&glslang-version;/glslang-&glslang-version;.tar.gz">
-  <!ENTITY glslang-download-ftp  " ">
-  <!ENTITY glslang-md5sum        "b2d0ae963b44e23533409eb63ea06a56">
-  <!ENTITY glslang-size          "3.6 MB">
-  <!ENTITY glslang-buildsize     "161 MB (with tests">
-  <!ENTITY glslang-time          "0.2 SBU (with parallelism=8; with tests)">
-]>
-
-<sect1 id="glslang" xreflabel="Glslang-&glslang-version;">
-  <?dbhtml filename="glslang.html"?>
-
-  <title>Glslang-&glslang-version;</title>
-
-  <indexterm zone="glslang">
-    <primary sortas="a-glslang">Glslang</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Glslang</title>
-
-    <para>
-      The <application>Glslang</application> package contains an frontend and
-      validator for OpenGL, OpenGL ES, and Vulkan shaders.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glslang-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glslang-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glslang-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glslang-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glslang-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glslang-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Glslang Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="spirv-tools"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glslang</title>
-
-    <para>
-      Install <application>Glslang</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      \
-      -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
-      -DBUILD_SHARED_LIBS=ON          \
-      -DGLSLANG_TESTS=ON              \
-      -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>-DALLOW_EXTERNAL_SPIRV_TOOLS=ON</parameter>: This switch allows
-      the build system to use the system-installed copy of
-      <xref linkend="spirv-tools" role="nodep"/>, instead of downloading and
-      installing it's own copy.
-    </para>
-
-    <para>
-      <parameter>-DBUILD_SHARED_LIBS=ON</parameter>: This switch builds shared
-      versions of the libraries, and does not install static versions of them.
-    </para>
-
-    <para>
-      <parameter>-DGLSLANG_TESTS=ON</parameter>: This switch builds the 
-      tests for the package.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          glslang,
-          glslang-validator (symlink to glslang), and
-          spirv-remap
-        </seg>
-        <seg>
-          libglslang.so,
-          libglslang-default-resource-limits.so,
-          libSPIRV.so, and
-          libSPVRemapper.so
-        </seg>
-        <seg>
-          /usr/include/glslang and
-          /usr/lib/cmake/glslang
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="glslang-prog">
-        <term><command>glslang</command></term>
-        <listitem>
-          <para>
-            provides a front end and validator for OpenGL, OpenGL ES, and
-            Vulkan shaders
-          </para>
-          <indexterm zone="glslang glslang-prog">
-            <primary sortas="b-glslang">glslang</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglslang">
-        <term><filename class="libraryfile">libglslang.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a front-end and validator for
-            OpenGL, OpenGL ES, and Vulkan shaders to other programs
-          </para>
-          <indexterm zone="glslang libglslang">
-            <primary sortas="c-libglslang">libglslang.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-<!-- Library removed in glslang-14.0.0
-      <varlistentry id="libHLSL">
-        <term><filename class="libraryfile">libHLSL.so</filename></term>
-        <listitem>
-          <para>
-            provides a front-end for shaders that are in HLSL format
-          </para>
-          <indexterm zone="glslang libHLSL">
-            <primary sortas="c-libHLSL">libHLSL.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-
-      <varlistentry id="libSPIRV">
-        <term><filename class="libraryfile">libSPIRV.so</filename></term>
-        <listitem>
-          <para>
-            provides a front-end and generator for SPIR-V binaries
-          </para>
-          <indexterm zone="glslang libSPIRV">
-            <primary sortas="c-libSPIRV">libSPIRV.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSPVRemapper">
-        <term><filename class="libraryfile">libSPVRemapper.so</filename></term>
-        <listitem>
-          <para>
-            provides a remapper for SPIR-V binaries
-          </para>
-          <indexterm zone="glslang libSPVRemapper">
-            <primary sortas="c-libSPVRemapper">libSPVRemapper.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/glu.xml
===================================================================
--- x/lib/glu.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 glu-download-http "https://archive.mesa3d.org/glu/glu-&glu-version;.tar.xz">
-  <!ENTITY glu-download-ftp  " ">
-  <!ENTITY glu-md5sum        "06a4fff9179a98ea32ef41b6d83f6b19">
-  <!ENTITY glu-size          "216 KB">
-  <!ENTITY glu-buildsize     "5.9 MB">
-  <!ENTITY glu-time          "0.2 SBU">
-]>
-
-<sect1 id="glu" xreflabel="GLU-&glu-version;">
-  <?dbhtml filename="glu.html"?>
-
-
-  <title>GLU-&glu-version;</title>
-
-  <indexterm zone="glu">
-    <primary sortas="a-GLU">GLU</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GLU</title>
-
-    <para>
-      This package provides the Mesa OpenGL Utility library.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&glu-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&glu-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &glu-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &glu-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &glu-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &glu-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GLU Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mesa"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GLU</title>
-
-    <para>
-      Install <application>GLU</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup ..              \
-      --prefix=$XORG_PREFIX \
-      -Dgl_provider=gl      \
-      --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 &amp;&amp;
-rm -vf /usr/lib/libGLU.a</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>
-          libGLU.so
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libGLU">
-        <term><filename class="libraryfile">libGLU.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>Mesa</application> OpenGL
-            Utility library
-          </para>
-          <indexterm zone="glu libGLU">
-            <primary sortas="c-libGLU">libGLU.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/goffice010.xml
===================================================================
--- x/lib/goffice010.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 goffice010-download-http
-           "&gnome-download-http;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
-  <!ENTITY goffice010-download-ftp  " ">
-  <!ENTITY goffice010-md5sum        "4c55f99d8fafe1f91276cb7538521fdb">
-  <!ENTITY goffice010-size          "2.4 MB">
-  <!ENTITY goffice010-buildsize     "81 MB (with tests)">
-  <!ENTITY goffice010-time          "0.4 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="goffice010" xreflabel="GOffice-&goffice010-version;">
-  <?dbhtml filename="goffice010.html"?>
-
-
-  <title>GOffice-&goffice010-version;</title>
-
-  <indexterm zone="goffice010">
-    <primary sortas="a-GOffice">GOffice</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GOffice</title>
-
-    <para>
-      The <application>GOffice</application> package contains a library of
-      <application>GLib</application>/<application>GTK</application> document
-      centric objects and utilities. This is useful for performing common
-      operations for document centric applications that are conceptually simple,
-      but complex to implement fully. Some of the operations provided by the
-      <application>GOffice</application> library include support for plugins,
-      load/save routines for application documents and undo/redo functions.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&goffice010-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&goffice010-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &goffice010-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &goffice010-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &goffice010-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &goffice010-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/goffice-&goffice010-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GOffice Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libgsf"/>,
-      <xref linkend="librsvg"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      &gobject-introspection;,
-      <xref linkend="gs"/>,
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="gtk-doc"/>,
-      <ulink url="&gnome-download-http;/lasem/">Lasem</ulink>, and
-      <ulink url="https://www.freedesktop.org/wiki/Software/libspectre">
-      libspectre</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GOffice</title>
-
-<!--
-    <para>
-      First, fix a problem with spreadsheets with graphs and some invalid data,
-      and resolve some GTK Critical warnings:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../goffice-&goffice010-version;-upstream_fixes-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>GOffice</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      If you wish to run the tests, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </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>
-          libgoffice-0.10.so
-        </seg>
-        <seg>
-          /usr/include/libgoffice-0.10,
-          /usr/{lib,share}/goffice, and
-          /usr/share/gtk-doc/html/goffice-0.10
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgoffice010">
-        <term><filename class="libraryfile">libgoffice-0.10.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions to provide support for document centric
-            objects and utilities
-          </para>
-          <indexterm zone="goffice010 libgoffice010">
-            <primary sortas="c-libgoffice-0.10">libgoffice-0.10.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/grantlee.xml
===================================================================
--- x/lib/grantlee.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 grantlee-download-http
-    "https://github.com/steveire/grantlee/releases/download/v&grantlee-version;/grantlee-&grantlee-version;.tar.gz">
-<!--           "http://downloads.grantlee.org/grantlee-&grantlee-version;.tar.gz"> -->
-  <!ENTITY grantlee-download-ftp  " ">
-  <!ENTITY grantlee-md5sum        "4ef8eae5dd61e3c7603d76208eb4d922">
-  <!ENTITY grantlee-size          "1.1 MB">
-  <!ENTITY grantlee-buildsize     "27 MB">
-  <!ENTITY grantlee-time          "0.4 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="grantlee" xreflabel="grantlee-&grantlee-version;">
-  <?dbhtml filename="grantlee.html"?>
-
-
-  <title>Grantlee-&grantlee-version;</title>
-
-  <indexterm zone="grantlee">
-    <primary sortas="a-grantlee">grantlee</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to grantlee</title>
-
-    <para>
-       Grantlee is a set of free software libraries written using the Qt
-       framework. Currently two libraries are shipped with Grantlee: Grantlee
-       Templates and Grantlee TextDocument. The goal of Grantlee Templates is
-       to make it easier for application developers to separate the structure
-       of documents from the data they contain, opening the door for theming.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&grantlee-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&grantlee-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &grantlee-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &grantlee-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &grantlee-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &grantlee-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Grantlee Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      &qt5-deps;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grantlee</title>
-
-    <para>
-      Install <application>Grantlee</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>
-          libGrantlee_Templates.so and
-          libGrantlee_TextDocument.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/Grantlee5,
-          /usr/lib/grantlee/5.2, and
-          /usr/include/grantlee</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libGrantlee_Templates">
-        <term><filename class="libraryfile">libGrantlee_Templates.so</filename></term>
-        <listitem>
-          <para>
-            contains common documentation templates for separating documents
-            from their structure
-          </para>
-          <indexterm zone="grantlee libGrantlee_Templates">
-            <primary sortas="c-libGrantlee_Templates">libGrantlee_Templates.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libGrantlee_TextDocument">
-        <term><filename class="libraryfile">libGrantlee_TextDocument.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that allow separating the content of text
-            documents from their structure.
-          </para>
-          <indexterm zone="grantlee libGrantlee_TextDocument">
-            <primary sortas="c-libGrantlee_TextDocument">libGrantlee_TextDocument.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/graphene.xml
===================================================================
--- x/lib/graphene.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,159 +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 graphene-download-http "&gnome-download-http;/graphene/1.10/graphene-&graphene-version;.tar.xz">
-  <!ENTITY graphene-download-ftp  " ">
-  <!ENTITY graphene-md5sum        "169e3c507b5a5c26e9af492412070b81">
-  <!ENTITY graphene-size          "328 KB">
-  <!ENTITY graphene-buildsize     "7.6 MB">
-  <!ENTITY graphene-time          "less than 0.1 SBU (with tests)">
-]>
-
-<sect1 id="graphene" xreflabel="graphene-&graphene-version;">
-  <?dbhtml filename="graphene.html"?>
-
-
-  <title>Graphene-&graphene-version;</title>
-
-  <indexterm zone="graphene">
-    <primary sortas="a-graphene">graphene</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Graphene</title>
-
-    <para>
-      The <application>Graphene</application> package provides a thin layer
-      of types for graphics libraries.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&graphene-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&graphene-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &graphene-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &graphene-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &graphene-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &graphene-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Graphene Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      &gobject-introspection;
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Graphene</title>
-
-    <para>
-      Install <application>Graphene</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 switch if you have
-      <xref role="nodep" linkend="gtk-doc"/> 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>
-          libgraphene-1.0.so
-        </seg>
-        <seg>
-          /usr/include/graphene-1.0,
-          /usr/lib/graphene-1.0,
-          /usr/{libexec,share}/installed-tests/graphene-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgraphene">
-        <term><filename class="libraryfile">libgraphene-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide a thin layer of types for graphics
-            libraries
-          </para>
-          <indexterm zone="graphene libgraphene">
-            <primary sortas="c-libgraphene">libgraphene-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/gtk+.xml
===================================================================
--- x/lib/gtk+.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk+.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect1 id="GTK" xreflabel="GTK+-&GTK-version;">
+<?dbhtml filename="gtk.html" dir="x"?>
+<title>GTK+-&GTK-version;</title>
+
+&GTK-intro;
+&GTK-inst;
+&GTK-config;
+&GTK-desc;
+
+</sect1>
+
Index: x/lib/gtk+2.xml
===================================================================
--- x/lib/gtk+2.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ x/lib/gtk+2.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,352 +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="GTK2" xreflabel="GTK+2-&GTK2-version;">
+<?dbhtml filename="gtk2.html" dir="x"?>
+<title>GTK+-&GTK2-version;</title>
 
-  <!ENTITY gtk2-download-http "&gnome-download-http;/gtk+/2.24/gtk+-&gtk2-version;.tar.xz">
-  <!ENTITY gtk2-download-ftp  " ">
-  <!ENTITY gtk2-md5sum        "0118e98dbe0e4dab90ce475f9f0e6c0c">
-  <!ENTITY gtk2-size          "12 MB">
-  <!ENTITY gtk2-buildsize     "285 MB">
-  <!ENTITY gtk2-time          "0.9 SBU (using parallelism=4; add 0.1 SBU for tests)">
-]>
-
-<sect1 id="gtk2" xreflabel="GTK+-&gtk2-version;">
-  <?dbhtml filename="gtk2.html" ?>
-
-
-  <title>GTK+-&gtk2-version;</title>
-
-  <indexterm zone="gtk2">
-    <primary sortas="a-GTK+2">GTK+2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK+ 2</title>
-
-    <para>
-      The <application>GTK+ 2</application> package contains
-      libraries used for creating graphical user interfaces
-      for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK+ 2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="gdk-pixbuf"/> and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="hicolor-icon-theme"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cups"/>,
-      <xref linkend="docbook-utils"/>,
-      <xref role="runtime" linkend="gnome-themes-extra"/> (runtime, for
-      Adwaita and HighContrast themes),
-      &gobject-introspection; and
-      <xref linkend="gtk-doc"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK+ 2</title>
-
-    <para>
-      Install <application>GTK+ 2</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -e 's#l \(gtk-.*\).sgml#&amp; -o \1#' \
-    -i docs/{faq,tutorial}/Makefile.in      &amp;&amp;
-
-./configure --prefix=/usr --sysconfdir=/etc &amp;&amp;
-
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make -k check</command>. Note that you
-      must run the tests from a session with X Window Display capability (i.e.,
-      not a text-based terminal/console) as the tests attempt to open an X
-      window, and the tests can take an excessively long time. Using an X
-      Window, the tests should take less than 0.1 SBU. One test,
-      aliasfilescheck.sh, is known to fail.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        must be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gtk-query-immodules-2.0 --update-cache</userinput></screen>
-    </note>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i 's#l \(gtk-.*\).sgml#&amp; -o \1#'
-      docs/{faq,tutorial}/Makefile.in</command>: If you have
-      <xref linkend="docbook-utils"/> installed (specifically, if configure
-      finds <command>db2html</command>) then it will try to use it to rebuild
-      some of its HTML documentation and fail due to bugs in some of the
-      <filename>Makefile</filename>s. This <command>sed</command> fixes the
-      <filename>Makefile</filename>s.
-    </para>
-    <!-- This still seems to have problems with docbook-utils installed.
-         However, since it's already been tagged, I'll leave it alone. -->
-<!--
-    <para>
-      <command>sed -i -e 's#pltcheck.sh#$(NULL)#g' gtk/Makefile.in</command>:
-      This <command>sed</command> disables one test known to fail.
-      Not necessary, if not running the tests.
-    </para>-->
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GTK+ 2</title>
-
-    <sect3 id="gtk2-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.gtkrc-2.0</filename>,
-        <filename>/etc/gtk-2.0/gtkrc</filename>, and
-        <filename>/usr/share/gtk-2.0/gtkrc</filename>
-      </para>
-
-      <indexterm zone="gtk2 gtk2-config">
-        <primary sortas="e-AA.gtkrc-2.0">~/.gtkrc-2.0</primary>
-      </indexterm>
-
-      <indexterm zone="gtk2 gtk2-config">
-        <primary sortas="e-etc-gtk-2.0-gtkrc">/etc/gtk-2.0/gtkrc</primary>
-      </indexterm>
-
-      <indexterm zone="gtk2 gtk2-config">
-        <primary sortas="e-usr-share-gtk-2.0-gtkrc">/usr/share/gtk-2.0/gtkrc</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>GTK+ 2</application> themes change the way a
-        <application>GTK+ 2</application> application looks. A
-        <application>GTK+ 2</application> icon theme can be used to change the
-        icons that appear on the application's toolbar. If you have installed a
-        <application>GTK+ 2</application> theme (such as
-        <xref linkend="gnome-themes-extra"/> or
-        <xref linkend="gtk-engines"/>), or a
-        <application>GTK+</application> icon theme (such as <xref
-        linkend="adwaita-icon-theme"/>) you can set your preferences in
-        <filename>~/.gtkrc-2.0</filename>:
-      </para>
-
-<screen><userinput>cat &gt; ~/.gtkrc-2.0 &lt;&lt; "EOF"
-<literal>include "/usr/share/themes/<replaceable>Glider</replaceable>/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "<replaceable>hicolor</replaceable>"</literal>
-EOF</userinput></screen>
-
-      <para>
-        There are many more themes available at
-        <ulink url="https://gnome-look.org/">Gnome-Look.org</ulink> and other
-        places.
-      </para>
-
-      <para>
-        Once you've settled on themes you like, you can (as the
-        <systemitem class="username">root</systemitem> user) make them the
-        default system wide:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/gtk-2.0/gtkrc &lt;&lt; "EOF"
-<literal>include "/usr/share/themes/<replaceable>Clearlooks</replaceable>/gtk-2.0/gtkrc"
-gtk-icon-theme-name = "<replaceable>elementary</replaceable>"</literal>
-EOF</userinput></screen>
-
-<!--
-      <para>
-        <xref linkend="lxappearance"/> is a <application>GTK+ 2</application>
-        application that can help you choose the themes you like.
-      </para>
--->
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtk-builder-convert, gtk-demo, gtk-query-immodules-2.0, and
-          gtk-update-icon-cache
-        </seg>
-        <seg>
-          libgailutil.so, libgdk-x11-2.0.so, and libgtk-x11-2.0.so
-        </seg>
-        <seg>
-          /etc/gtk-2.0,
-          /usr/include/{gail-1.0,gtk-2.0,gtk-unix-print-2.0},
-          /usr/lib/gtk-2.0,
-          /usr/share/doc/gtk+-&gtk2-version;,
-          /usr/share/gtk-2.0,
-          /usr/share/gtk-doc/html/{gail-libgail-util,gdk2,gtk2}, and
-          /usr/share/themes/{Default,Emacs,Raleigh}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtk-builder-convert">
-        <term><command>gtk-builder-convert</command></term>
-        <listitem>
-          <para>
-           converts glade files into XML files which can be loaded with
-           GtkBuilder
-          </para>
-          <indexterm zone="gtk2 gtk-builder-convert">
-            <primary sortas="b-gtk-builder-convert">gtk-builder-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-demo">
-        <term><command>gtk-demo</command></term>
-        <listitem>
-          <para>
-            demonstrates <application>GTK+ 2</application> functionality and
-            provides code for the examples
-          </para>
-          <indexterm zone="gtk2 gtk-demo">
-            <primary sortas="b-gtk-demo">gtk-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-query-immodules-2.0">
-        <term><command>gtk-query-immodules-2.0</command></term>
-        <listitem>
-          <para>
-            collects information about loadable input method modules for
-            <application>GTK+ 2</application> and writes it to standard output
-          </para>
-          <indexterm zone="gtk2 gtk-query-immodules-2.0">
-            <primary sortas="b-gtk-query-immodules-2.0">gtk-query-immodules-2.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-update-icon-cache">
-        <term><command>gtk-update-icon-cache</command></term>
-        <listitem>
-          <para>
-            creates mmap()able cache files for icon themes. Starting with
-            <application>gtk+-2.24.24</application>, add the flag
-            <quote>--include-image-data</quote> to this command, if you wish
-            previous behavior, with image data in the cache
-          </para>
-          <indexterm zone="gtk2 gtk-update-icon-cache">
-            <primary sortas="b-gtk-update-icon-cache">gtk-update-icon-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdk-x11-2">
-        <term><filename class="libraryfile">libgdk-x11-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that act as a wrapper around the low-level
-            drawing and windowing functions provided by the underlying graphics
-            system
-          </para>
-          <indexterm zone="gtk2 libgdk-x11-2">
-            <primary sortas="c-libgdk-x11-2">libgdk-x11-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-x11-2">
-        <term><filename class="libraryfile">libgtk-x11-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="gtk2 libgtk-x11-2">
-            <primary sortas="c-libgtk-x11-2">libgtk-x11-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&GTK2-intro;
+&GTK2-inst;
+&GTK2-config;
+&GTK2-desc;
 
 </sect1>
+
Index: x/lib/gtk+3.xml
===================================================================
--- x/lib/gtk+3.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,502 +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 gtk3-download-http "&gnome-download-http;/gtk+/&gnome-minor-24;/gtk+-&gtk3-version;.tar.xz">
-  <!ENTITY gtk3-download-ftp  " ">
-  <!ENTITY gtk3-md5sum        "2321e8158feac093b6ed82aac66dbbfd">
-  <!ENTITY gtk3-size          "13 MB">
-  <!ENTITY gtk3-buildsize     "238 MB (add 8 MB for tests)">
-  <!ENTITY gtk3-time          "0.8 SBU (using parallelism=4; add 0.2 SBU for tests)">
-]>
-
-<sect1 id="gtk3" xreflabel="GTK+-&gtk3-version;">
-  <?dbhtml filename="gtk3.html"?>
-
-
-  <title>GTK+-&gtk3-version;</title>
-
-  <indexterm zone="gtk3">
-    <primary sortas="a-GTK+3">GTK+3</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK+ 3</title>
-
-    <para>
-      The <application>GTK+ 3</application> package contains
-      libraries used for creating graphical user interfaces for
-      applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK+ 3 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="libepoxy"/>, and
-      <xref linkend="pango"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref role='runtime' linkend="adwaita-icon-theme"/>
-        (at runtime; default for some gtk+3 settings keys and
-        also needed for one test),
-      <xref linkend="docbook-xsl"/> (for generating manual pages),
-      <xref linkend="hicolor-icon-theme"/> (needed for tests),
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="libxslt"/> (for generating manual pages),
-      <xref linkend="sassc"/>,
-      <xref linkend="wayland"/>, and
-      <xref linkend="wayland-protocols"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Required if building GNOME)</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="libcloudproviders"/>,
-      <xref linkend="pyatspi2"/> (for tests),
-      <xref linkend='tracker3'/>, and
-      <ulink url="https://icl.utk.edu/papi/">PAPI</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK+ 3</title>
-
-    <para>
-      Install <application>GTK+ 3</application> by running the following
-      commands:
-    </para>
-
-    <screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-meson setup --prefix=/usr           \
-            --buildtype=release     \
-            -Dman=true              \
-            -Dbroadway_backend=true \
-            ..                      &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results you need a graphical session, then issue
-      <command>dbus-run-session ninja test</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      One test named <filename>check-cursor-names</filename> is known
-      to fail if <xref linkend='adwaita-icon-theme'/> is not installed.
-    </para>
-
-    <note>
-      <para>
-        If you installed the package on to your system using a
-        <quote>DESTDIR</quote> method, an important file was not installed and
-        must be copied and/or generated. Generate it using the following
-        command as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>gtk-query-immodules-3.0 --update-cache</userinput></screen>
-    </note>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gsettings-destdir.xml"/>
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-Dbroadway_backend=true</parameter>: This switch enables the
-      HTML5 GTK backend.
-    </para>
-
-    <para>
-      <parameter>-Dman=true</parameter>: This switch allows generating
-      manual pages.
-    </para>
-
-    <para>
-      <option>-Dgtk_doc=true</option>: This switch enables building
-      documentation. It requires <xref linkend="gtk-doc"/>.
-    </para>
-
-    <para>
-      <option>-Dtracker3=true</option>: This switch enables the search
-      function based on Tracker 3 in the GTK+-3 file chooser dialog.
-      It requires <xref linkend="tracker3"/>.
-    </para>
-
-    <para>
-      <option>-Dcloudproviders=true</option>: Use this switch if you have
-      <xref linkend="libcloudproviders" role="nodep"/> installed and wish to
-      enable support for cloud providers in a file chooser window.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GTK+ 3</title>
-
-    <sect3 id="gtk3-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/gtk-3.0/settings.ini</filename> and
-        <filename>/etc/gtk-3.0/settings.ini</filename>
-      </para>
-
-      <indexterm zone="gtk3 gtk3-config">
-        <primary sortas="e-AA.home-settings.ini">~/.config/gtk-3.0/settings.ini</primary>
-      </indexterm>
-
-      <indexterm zone="gtk3 gtk3-config">
-        <primary sortas="e-etc-path-settings.ini">/etc/gtk-3.0/settings.ini</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>GTK+ 3</application> themes change the way a
-        <application>GTK+ 3</application> application looks. An icon theme can
-        be used to change the icons that appear on the application's toolbar.
-        If you have installed a <application>GTK+ 3</application> theme (e.g.
-        the Adwaita theme built in <application>GTK+ 3</application>),
-        an icon theme (such as <xref
-        linkend="oxygen-icons"/>) and/or a font (<xref linkend="dejavu-fonts"/>),
-        you can set your preferences in <filename>~/.config/gtk-3.0/settings.ini</filename>,
-        or the default system wide configuration file (as the <systemitem
-        class="username">root</systemitem> user), in
-        <filename>/etc/gtk-3.0/settings.ini</filename>.  For the local user an
-        example is:
-      </para>
-
-<screen><userinput>mkdir -vp ~/.config/gtk-3.0
-cat &gt; ~/.config/gtk-3.0/settings.ini &lt;&lt; "EOF"
-<literal>[Settings]
-gtk-theme-name = <replaceable>Adwaita</replaceable>
-gtk-icon-theme-name = <replaceable>oxygen</replaceable>
-gtk-font-name = <replaceable>DejaVu Sans 12</replaceable>
-gtk-cursor-theme-size = <replaceable>18</replaceable>
-gtk-toolbar-style = <replaceable>GTK_TOOLBAR_BOTH_HORIZ</replaceable>
-gtk-xft-antialias = <replaceable>1</replaceable>
-gtk-xft-hinting = <replaceable>1</replaceable>
-gtk-xft-hintstyle = <replaceable>hintslight</replaceable>
-gtk-xft-rgba = <replaceable>rgb</replaceable>
-gtk-cursor-theme-name = <replaceable>Adwaita</replaceable></literal>
-EOF</userinput></screen>
-
-      <para>
-        There are many settings keys, some with default values. You can find
-        them at <ulink
-        url="https://developer.gnome.org/gtk3/stable/GtkSettings.html">Settings:
-        GTK+ 3 Reference Manual</ulink>. There are many more themes available at
-        <ulink url="https://www.gnome-look.org/browse/"/> and other places.
-      </para>
-
-      <para>
-        As part of GTK+-3.0's redesign, the scroll bar buttons are no longer
-        visible on the scrollbar in many applications. If this functionality
-        is desired, modify the <filename>gtk.css</filename> file and restore
-        them using the following command:
-      </para>
-
-<screen><userinput>cat &gt; ~/.config/gtk-3.0/gtk.css &lt;&lt; "EOF"
-<literal>*  {
-   -GtkScrollbar-has-backward-stepper: 1;
-   -GtkScrollbar-has-forward-stepper: 1;
-}</literal>
-EOF</userinput></screen>
-
-      <!-- This trick was discovered in the Seamonkey-2.53.2 release notes:
-           http://www.seamonkey-project.org/releases/seamonkey2.53.2/ -->
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          broadwayd,
-          gtk3-demo,
-          gtk3-demo-application,
-          gtk3-icon-browser,
-          gtk3-widget-factory,
-          gtk-builder-tool,
-          gtk-encode-symbolic-svg,
-          gtk-launch,
-          gtk-query-immodules-3.0,
-          gtk-query-settings, and
-          gtk-update-icon-cache
-        </seg>
-        <seg>
-          libgailutil-3.so, libgdk-3.so, and libgtk-3.so
-        </seg>
-        <seg>
-          /etc/gtk-3.0,
-          /usr/include/{gail,gtk}-3.0,
-          /usr/{lib,share}/gtk-3.0, and
-          /usr/share/themes/{Default,Emacs}/gtk-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="broadwayd">
-        <term><command>broadwayd</command></term>
-        <listitem>
-          <para>
-            provides support for displaying
-            <application>GTK+ 3</application> applications in a web browser,
-            using HTML5 and web sockets
-          </para>
-          <indexterm zone="gtk3 broadwayd">
-            <primary sortas="b-broadwayd">broadwayd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo">
-        <term><command>gtk3-demo</command></term>
-        <listitem>
-          <para>
-            is a simple program that demonstrates some of the tasks that can be
-            done with <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="gtk3 gtk3-demo">
-            <primary sortas="b-gtk3-demo">gtk3-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-demo-application">
-        <term><command>gtk3-demo-application</command></term>
-        <listitem>
-          <para>
-            is a simple <application>GTK+ 3</application> application
-          </para>
-          <indexterm zone="gtk3 gtk3-demo-application">
-            <primary sortas="b-gtk3-demo-application">gtk3-demo-application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-icon-browser">
-        <term><command>gtk3-icon-browser</command></term>
-        <listitem>
-          <para>
-            is a utility to explore the icons in the current icon theme. It
-            shows icons in various sizes, their symbolic variants where
-            available, as well as a description of the icon and its context
-          </para>
-          <indexterm zone="gtk3 gtk3-icon-browser">
-            <primary sortas="b-gtk3-icon-browser">gtk3-icon-browser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk3-widget-factory">
-        <term><command>gtk3-widget-factory</command></term>
-        <listitem>
-          <para>
-            is a program to view <application>GTK+ 3</application> themes and widgets
-          </para>
-          <indexterm zone="gtk3 gtk3-widget-factory">
-            <primary sortas="b-gtk3-widget-factory">gtk3-widget-factory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-builder-tool">
-        <term><command>gtk-builder-tool</command></term>
-        <listitem>
-          <para>
-            performs various operations on GtkBuilder .ui files
-          </para>
-          <indexterm zone="gtk3 gtk-builder-tool">
-            <primary sortas="b-gtk-builder-tool">gtk-builder-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-encode-symbolic-svg">
-        <term><command>gtk-encode-symbolic-svg</command></term>
-        <listitem>
-          <para>
-            converts symbolic SVG icons into specially prepared PNG files.
-            <application>GTK+ 3</application> can load and recolor these PNGs,
-            just like original SVGs, but loading them is much faster
-          </para>
-          <indexterm zone="gtk3 gtk-encode-symbolic-svg">
-            <primary sortas="b-gtk-encode-symbolic-svg">gtk-encode-symbolic-svg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-launch">
-        <term><command>gtk-launch</command></term>
-        <listitem>
-          <para>
-            launches an application using the given name. The name should match
-            the application desktop file name, as residing in
-            <filename class="directory">/usr/share/applications</filename>, with
-            or without the '.desktop' suffix
-          </para>
-          <indexterm zone="gtk3 gtk-launch">
-            <primary sortas="b-gtk-launch">gtk-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-query-immodules-3.0">
-        <term><command>gtk-query-immodules-3.0</command></term>
-        <listitem>
-          <para>
-            collects information about loadable input method modules for
-            <application>GTK+ 3</application> and writes it to the default cache
-            file location, or to standard output
-          </para>
-          <indexterm zone="gtk3 gtk-query-immodules-3.0">
-            <primary sortas="b-gtk-query-immodules-3.0">gtk-query-immodules-3.0</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-query-settings">
-        <term><command>gtk-query-settings</command></term>
-        <listitem>
-          <para>
-            provides a complete listing of all settings related to
-            <application>GTK+ 3</application>
-          </para>
-          <indexterm zone="gtk3 gtk-query-settings">
-            <primary sortas="b-gtk-query-settings">gtk-query-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk-update-icon-cache3">
-        <term><command>gtk-update-icon-cache</command></term>
-        <listitem>
-          <para>
-            is an icon theme caching utility that creates mmap()able cache files
-            for icon themes
-          </para>
-          <indexterm zone="gtk3 gtk-update-icon-cache3">
-            <primary sortas="b-gtk-update-icon-cache3">gtk-update-icon-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgailutil-3">
-        <term><filename class="libraryfile">libgailutil-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that implement the accessibility interfaces
-            defined by the <application>GNOME</application> Accessibility
-            Toolkit
-          </para>
-          <indexterm zone="gtk3 libgailutil-3">
-            <primary sortas="c-libgailutil-3">libgailutil-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgdk-3">
-        <term><filename class="libraryfile">libgdk-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that act as a wrapper around the low-level
-            drawing and windowing functions provided by the underlying graphics
-            system
-          </para>
-          <indexterm zone="gtk3 libgdk-3">
-            <primary sortas="c-libgdk-3">libgdk-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-3">
-        <term><filename class="libraryfile">libgtk-3.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="gtk3 libgtk-3">
-            <primary sortas="c-libgtk-3">libgtk-3.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtk-engines.xml
===================================================================
--- x/lib/gtk-engines.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 gtk-engines-download-http
-    "&gnome-download-http;/gtk-engines/2.20/gtk-engines-&gtk-engines-version;.tar.bz2">
-  <!ENTITY gtk-engines-download-ftp  " ">
-  <!ENTITY gtk-engines-md5sum        "5deb287bc6075dc21812130604c7dc4f">
-  <!ENTITY gtk-engines-size          "676 KB">
-  <!ENTITY gtk-engines-buildsize     "19 MB">
-  <!ENTITY gtk-engines-time          "0.4 SBU">
-]>
-
-<sect1 id="gtk-engines" xreflabel="GTK Engines-&gtk-engines-version;">
-  <?dbhtml filename="gtk-engines.html"?>
-
-
-  <title>GTK Engines-&gtk-engines-version;</title>
-
-  <indexterm zone="gtk-engines">
-    <primary sortas="a-GTK Engines">GTK Engines</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK Engines</title>
-
-    <para>
-      The <application>GTK Engines</application> package contains eight
-      themes/engines and two additional engines for
-      <application>GTK2</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-engines-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-engines-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-engines-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-engines-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-engines-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-engines-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK Engines Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="lua"/> and
-      <xref linkend="which"/> (required for test suite)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK Engines</title>
-
-    <para>
-      Install <application>GTK Engines</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>
-      <option>--enable-lua --with-system-lua</option>: Use these switches if you
-      installed <application>Lua</application> and want to build Lua theming
-      engine.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-      <segtitle>Installed Themes</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libclearlooks.so,
-          libcrux-engine.so,
-          libglide.so,
-          libhcengine.so,
-          libindustrial.so,
-          libmist.so,
-          libredmond95.so and
-          libthinice.so (GTK-2 engines libraries)
-        </seg>
-        <seg>
-          /usr/lib/gtk-&gtk2-libdir;/engines,
-          /usr/share/gtk-engines,
-          /usr/share/themes/Clearlooks,
-          /usr/share/themes/Crux,
-          /usr/share/themes/Industrial,
-          /usr/share/themes/Mist,
-          /usr/share/themes/Redmond and
-          /usr/share/themes/ThinIce
-        </seg>
-        <seg>
-          Clearlooks,
-          Crux,
-          Industrial,
-          Mist,
-          Redmond and
-          ThinIce
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry>
-        <term>engine libraries</term>
-        <listitem>
-          <para>
-            are manager systems for specific themes
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/gtk-vnc.xml
===================================================================
--- x/lib/gtk-vnc.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,231 +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 gtk-vnc-download-http "&gnome-download-http;/gtk-vnc/1.3/gtk-vnc-&gtk-vnc-version;.tar.xz">
-  <!ENTITY gtk-vnc-download-ftp  " ">
-  <!ENTITY gtk-vnc-md5sum        "27f0dc7f33cbfdaa6c9eb7cf169f4866">
-  <!ENTITY gtk-vnc-size          "220 KB">
-  <!ENTITY gtk-vnc-buildsize     "5.2 MB">
-  <!ENTITY gtk-vnc-time          "0.1 SBU">
-]>
-
-<sect1 id="gtk-vnc" xreflabel="gtk-vnc-&gtk-vnc-version;">
-  <?dbhtml filename="gtk-vnc.html"?>
-
-
-  <title>gtk-vnc-&gtk-vnc-version;</title>
-
-  <indexterm zone="gtk-vnc">
-    <primary sortas="a-gtk-vnc">gtk-vnc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtk VNC</title>
-
-    <para>
-      The <application>Gtk VNC</application> package contains a VNC viewer widget
-      for <application>GTK+</application>. It is built using coroutines allowing
-      it to be completely asynchronous while remaining single threaded.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk-vnc-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk-vnc-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk-vnc-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk-vnc-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk-vnc-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk-vnc-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtk VNC Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gnutls"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="libgcrypt"/>
-    </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="cyrus-sasl"/> and
-      <xref linkend="pulseaudio"/>
-      <!-- <ulink url="https://view.sourceforge.net/">libview</ulink> -->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtk VNC</title>
-
-    <para>
-      Install <application>Gtk VNC</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>
-
-<!--
-    <para>
-      <parameter>- -with-gtk=3.0</parameter>: This switch enables
-      building of the <application>GTK+ 3</application> library
-      instead of the <application>GTK+ 2</application> one.
-    </para>
--->
-
-    <para>
-      <option>-Dwith-vala=false</option>: This switch disables
-      building of the Vala bindings. Add this if you decide to build gtk-vnc
-      without vala installed.
-    </para>
-
-<!--
-    <para>
-      <parameter>- -without-sasl</parameter>: This switch disables the
-      use of <application>Cyrus SASL</application> for authentication.
-      Remove it if you have installed
-      <application>Cyrus SASL</application> and wish to enable it for
-      authentication.
-    </para>
- -->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gvnccapture
-        </seg>
-        <seg>
-          libgtk-vnc-2.0.so, libgvnc-1.0.so and libgvncpulse-1.0.so
-        </seg>
-        <seg>
-          /usr/include/gtk-vnc-2.0,
-          /usr/include/gvnc-1.0 and
-          /usr/include/gvncpulse-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gvnccapture">
-        <term><command>gvnccapture</command></term>
-        <listitem>
-          <para>
-            is used to capture image from VNC server
-          </para>
-          <indexterm zone="gtk-vnc gvnccapture">
-            <primary sortas="b-gvnccapture">gvnccapture</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-vnc-2">
-        <term><filename class="libraryfile">libgtk-vnc-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>GTK+ 3</application> bindings for
-            <application>Gtk VNC</application>
-          </para>
-          <indexterm zone="gtk-vnc libgtk-vnc-2">
-            <primary sortas="c-libgtk-vnc-2.0">libgtk-vnc-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvnc-1a">
-        <term><filename class="libraryfile">libgvnc-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the GObject bindings for <application>Gtk VNC</application>
-          </para>
-          <indexterm zone="gtk-vnc libgvnc-1a">
-            <primary sortas="c-libgvnc-1.0">libgvnc-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgvncpulse-1">
-        <term><filename class="libraryfile">libgvncpulse-1.0.so</filename></term>
-        <listitem>
-          <para>
-            is the <application>PulseAudio</application> bridge for
-            <application>Gtk VNC</application>
-          </para>
-          <indexterm zone="gtk-vnc libgvncpulse-1">
-            <primary sortas="c-libgvncpulse-1.0">libgvncpulse-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtk/gtk+-config.xml
===================================================================
--- x/lib/gtk/gtk+-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring GTK+</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/gtk/gtk+-desc.xml
===================================================================
--- x/lib/gtk/gtk+-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The GTK+ package contains <userinput>GTK+ Libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>GTK+ Libraries</title>
+<para>GTK+ Libraries provide the API to implement graphical user
+interfaces.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/gtk/gtk+-inst.xml
===================================================================
--- x/lib/gtk/gtk+-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of GTK+</title>
+
+<para>Install GTK+ by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/gtk/gtk+-intro.xml
===================================================================
--- x/lib/gtk/gtk+-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Introduction to GTK+</title>
+
+<screen>Download location:              <ulink url="&GTK-download;"/>
+Version used:                   &GTK-version;
+Package size:                   &GTK-size;
+Estimated Disk space required:  &GTK-buildsize;</screen>
+
+<para>The GTK+ package contains GTK+ Libraries. This is useful for
+creating graphical user interfaces for applications.</para>
+
+<screen>GTK+ depends on:
+<xref linkend="GLib"/>, <xref linkend="libpng"/>, <xref linkend="libtiff"/> and <xref
+linkend="libjpeg"/></screen>
+
+</sect2>
Index: x/lib/gtk/gtk+2-config.xml
===================================================================
--- x/lib/gtk/gtk+2-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring GTK+</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/gtk/gtk+2-desc.xml
===================================================================
--- x/lib/gtk/gtk+2-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,16 @@
+<sect2>
+<title>Contents</title>
+
+<para>The GTK+ package contains <userinput>GTK+ Libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>GTK+ Libraries</title>
+<para>GTK+ Libraries provide the API to implement graphical user
+interfaces.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/gtk/gtk+2-inst.xml
===================================================================
--- x/lib/gtk/gtk+2-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of GTK+</title>
+
+<para>Install GTK+ by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/gtk/gtk+2-intro.xml
===================================================================
--- x/lib/gtk/gtk+2-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk+2-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to GTK+</title>
+
+<screen>Download location:              <ulink url="&GTK2-download;"/>
+Version used:                   &GTK2-version;
+Package size:                   &GTK2-size;
+Estimated Disk space required:  &GTK2-buildsize;</screen>
+
+<para>The GTK+ package contains GTK+ Libraries. This is useful for
+creating graphical user interfaces for applications.</para>
+
+<screen>GTK+ depends on:
+<xref linkend="GLib2"/>, <xref linkend="Pango"/>, <xref linkend="ATK"/>,
+<xref linkend="libpng"/>, <xref linkend="libtiff"/> and <xref
+linkend="libjpeg"/></screen>
+
+</sect2>
Index: x/lib/gtk/gtk.ent
===================================================================
--- x/lib/gtk/gtk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/gtk/gtk.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<!ENTITY GTK SYSTEM "../gtk+.xml">
+<!ENTITY GTK-intro SYSTEM "gtk+-intro.xml">
+<!ENTITY GTK-inst SYSTEM "gtk+-inst.xml">
+<!ENTITY GTK-desc SYSTEM "gtk+-desc.xml">
+<!ENTITY GTK-config SYSTEM "gtk+-config.xml">
+<!ENTITY GTK-buildsize "54 MB">
+<!ENTITY GTK-version "1.2.10">
+<!ENTITY GTK-download "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz">
+<!ENTITY GTK-size "2.7 MB">
+
+<!ENTITY GTK2 SYSTEM "../gtk+2.xml">
+<!ENTITY GTK2-intro SYSTEM "gtk+2-intro.xml">
+<!ENTITY GTK2-inst SYSTEM "gtk+2-inst.xml">
+<!ENTITY GTK2-desc SYSTEM "gtk+2-desc.xml">
+<!ENTITY GTK2-config SYSTEM "gtk+2-config.xml">
+<!ENTITY GTK2-buildsize "62.4 MB">
+<!ENTITY GTK2-version "2.0.5">
+<!ENTITY GTK2-download "ftp://ftp.gtk.org/pub/gtk/v2.0/gtk+-2.0.5.tar.gz">
+<!ENTITY GTK2-size "8.2 MB">
Index: x/lib/gtk4.xml
===================================================================
--- x/lib/gtk4.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,518 +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 gtk4-download-http "&gnome-download-http;/gtk/&gtk4-minor;/gtk-&gtk4-version;.tar.xz">
-  <!ENTITY gtk4-download-ftp  " ">
-  <!ENTITY gtk4-md5sum        "347219770bd27520209607c4d474c033">
-  <!ENTITY gtk4-size          "17 MB">
-  <!ENTITY gtk4-buildsize     "711 MB (with docs; add 66 MB for tests)">
-  <!ENTITY gtk4-time          "1.3 SBU (using parallelism=4; with docs; add 1.3 SBU for tests)">
-]>
-
-<sect1 id="gtk4" xreflabel="GTK-&gtk4-version;">
-  <?dbhtml filename="gtk4.html"?>
-
-  <title>GTK-&gtk4-version;</title>
-
-  <indexterm zone="gtk4">
-    <primary sortas="a-gtk4">GTK-4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GTK 4</title>
-
-    <para>
-      The <application>GTK 4</application> package contains libraries used for
-      creating graphical user interfaces for applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtk4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtk4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtk4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtk4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtk4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtk4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GTK 4 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fribidi"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="graphene"/>,
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libepoxy"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="pango"/>,
-      <xref linkend="pygobject3"/>, and
-      <xref linkend="wayland-protocols"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="adwaita-icon-theme"/> (default for some gtk4 settings keys),
-      <xref linkend="gst10-plugins-bad"/>,
-      <xref role='runtime' linkend="gst10-plugins-good"/> (runtime,
-      built with <xref role='nodep' linkend='libvpx'/>),
-      <xref linkend="hicolor-icon-theme"/> (needed for tests and for defaults), and
-      <xref linkend="librsvg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Required if building GNOME)</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="colord"/>,
-      <xref linkend="cups"/>,
-      <xref linkend="docutils"/>,
-      <xref linkend="ffmpeg"/> (built with
-      <xref role='nodep' linkend='libvpx'/>),
-      <xref linkend="gi-docgen"/>,
-      <xref role="runtime" linkend="highlight"/>
-        (runtime, only used by <command>gtk4-demo</command> for syntax
-        highlighting of demo source code),
-      <xref linkend="libcloudproviders"/>,
-      <xref linkend="sassc"/>,
-      <xref linkend="tracker3"/>,
-      <xref linkend="vulkan-loader"/>,
-      <ulink url="https://github.com/OpenPrinting/cpdb-libs">cpdb</ulink>,
-      <ulink url="https://github.com/google/shaderc">glslc</ulink>, and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-      <!--<ulink url="https://vulkan.lunarg.com/sdk/home">vulkan</ulink>-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GTK 4</title>
-
-    <para>
-      Install <application>GTK 4</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr           \
-            --buildtype=release     \
-            -Dbroadway-backend=true \
-            -Dintrospection=enabled \
-	    -Dvulkan=disabled       \
-            .. &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@'doc'@&amp; / 'gtk-&gtk4-version;'@" -i ../docs/reference/meson.build &amp;&amp;
-meson configure -Ddocumentation=true                             &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To run the tests, issue: <command>dbus-run-session meson test --setup
-      x11</command>. If you are in a Wayland session, replace x11 with wayland.
-      Nine tests are known to fail if
-      <ulink url="https://gitlab.gnome.org/GNOME/cantarell-fonts">Cantrell fonts</ulink>
-      are not installed. Many tests will fail if
-      <filename>~/.config/gtk-4.0/settings.ini</filename> exists and the gtk-modules
-      line is not commented out.
-      On systems with NVIDIA graphics cards, the tests may take significantly
-      longer than the above test time.
-    </para>
-<!-- [pierre]: 4.6.0, wayland: 727 ok; 2 Expected Fail;  1 Fail; 1 Skipped
-     [bdubbs]: 4.6.3, x11,     724 OK, 2 Expected Fail, 12 Fail. 1 Skipped
-     [pierre]: 4.6.6, wayland, 738 OK, 2 Expected Fail,  1 Fail. 1 Skipped
-     [pierre]: 4.6.7, wayland, 737 OK, 2 Expected Fail,  1 Fail. 1 Skipped. 1 Timeout
-     [bdubbs]: 4.6.7, x11,     758 OK, 2 Expected Fail,  9 Fail. 1 Skipped. 1 Timeout
-     [pierre]: 4.8.1, wayland, 765 OK, 2 Expected Fail,  2 Fail. 1 Skipped
-     [bdubbs]: 4.8.2, x11,     753 OK, 2 Expected Fail, 14 Fail. 1 Skipped
-     [pierre]: 4.8.3, wayland, 760 OK, 2 Expected Fail,  5 Fail. 3 Skipped
-     [bdubbs]: 4.10.0, x11,    701 OK, 0 Expected Fail, 15 Fail. 1 Skipped, 2 Timeout
-               above over ssh
-     [bdubbs]: 4.10.0, x11,    712 OK, 0 Expected Fail,  6 Fail. 1 Skipped, 0 Timeout
-               above on native x11
-     [bdubbs]: 4.12.0, x11,   1453 OK, 0 Expected Fail,  9 Fail. 5 Skipped, 0 Timeout
-               above on native x11
-     [bdubbs]: 4.12.1, x11,   1455 OK, 0 Expected Fail,  7 Fail. 5 Skipped, 0 Timeout
-               above on native x11
-     [renodr]: 4.12.4, x11,   1535 OK, 0 Expected Fail,  8 Fail, 5 Skipped, 0 Timeout
-               above on native X11
-     [rahul]: 4.14.1, wayland,   4174 OK, 0 Expected Fail,  81 Fail, 2 Skipped, 0 Timeout
-               above on native wayland (Plasma 6)
-     [renodr]: 4.14.2, wayland,  4211 OK, 0 Expected Fail, 43 Fail, 2 Skipped, 0 Timeout
-               above on wayland in GNOME
--->
-
-    <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>-Dbroadway-backend=true</parameter>: This switch enables the
-      HTML5 GDK backend.
-    </para>
-
-    <para>
-      <parameter>-Dintrospection=enabled</parameter>: This switch enables
-      using GObject Introspection to generate GIR bindings
-      of this packages.  These bindings are required by GNOME.
-    </para>
-
-    <para>
-      <option>-Dcloudproviders=enabled</option>: Use this switch if you have
-      <xref linkend="libcloudproviders" role="nodep"/> installed and wish to
-      enable support for cloud providers in a file chooser window.
-    </para>
-
-    <para>
-      <option>-Dtracker=enabled</option>: Use this switch if you have
-      <xref linkend="tracker3"/> installed and wish to use search functionality
-      when running a file chooser.
-    </para>
-
-    <para>
-      <option>-Dcolord=enabled</option>: Use this switch if you have
-      <xref linkend="colord"/> installed and wish to use colord with the CUPS
-      printing backend.
-    </para>
-
-    <para>
-      <option>-Dman-pages=true</option>: Use this switch if you have
-      <xref linkend='docutils'/> installed and wish to generate the man
-      pages.
-    </para>
-
-    <para>
-      <option>-Dsysprof=enabled</option>: Use this switch if you have
-      <ulink url="&sysprof-url;">sysprof</ulink> installed and wish to enable 
-      tracing support for GTK4-based applications.
-    </para>
-
-    <para>
-      <option>-Dvulkan=enabled</option>: Use this switch if you have
-      <xref linkend="vulkan-loader"/> installed and wish to build the
-      experimental Vulkan backend. Note that you must have
-      <ulink url="https://github.com/google/shaderc/blob/main/downloads.md">glslc</ulink>
-      installed if you decide to enable this option.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring GTK 4</title>
-
-    <sect3 id="gtk4-config">
-      <title>Config Files</title>
-      <para>
-        <filename>~/.config/gtk-4.0/settings.ini</filename> and
-        <filename>/usr/share/gtk-4.0/settings.ini</filename>
-      </para>
-
-      <indexterm zone="gtk4 gtk4-config">
-        <primary sortas="e-AA.home-gtk4-settings.ini">~/.config/gtk-4.0/settings.ini</primary>
-      </indexterm>
-
-      <indexterm zone="gtk4 gtk4-config">
-        <primary
-        sortas="e-usr-share-path-settings.ini">/usr/share/gtk-4.0/settings.ini</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        <application>GTK 4</application> themes change the way a
-        <application>GTK 4</application> application looks. An icon theme can
-        be used to change the icons that appear on the application's toolbar.
-        If you have installed a <application>GTK 4</application> theme (e.g.
-        the Adwaita theme built in <application>GTK 4</application>),
-        an icon theme (such as <xref linkend="oxygen-icons"/>) and/or a font
-        (<xref linkend="dejavu-fonts"/>), you can set your preferences in
-        <filename>~/.config/gtk-4.0/settings.ini</filename>, or the default
-        system-wide configuration file (as the
-        <systemitem class="username">root</systemitem> user), in
-        <filename>/usr/share/gtk-4.0/settings.ini</filename>. For the local
-        user, an example is:
-      </para>
-
-<screen><userinput>mkdir -pv ~/.config/gtk-4.0
-cat &gt; ~/.config/gtk-4.0/settings.ini &lt;&lt; "EOF"
-<literal>[Settings]
-gtk-theme-name = <replaceable>Adwaita</replaceable>
-gtk-icon-theme-name = <replaceable>oxygen</replaceable>
-gtk-font-name = <replaceable>DejaVu Sans 12</replaceable>
-gtk-cursor-theme-size = <replaceable>18</replaceable>
-gtk-xft-antialias = <replaceable>1</replaceable>
-gtk-xft-hinting = <replaceable>1</replaceable>
-gtk-xft-hintstyle = <replaceable>hintslight</replaceable>
-gtk-xft-rgba = <replaceable>rgb</replaceable>
-gtk-cursor-theme-name = <replaceable>Adwaita</replaceable></literal>
-EOF</userinput></screen>
-
-       <para>
-         There are many settings keys, some with default values. You can find
-         them at <ulink
-         url="https://developer.gnome.org/gtk4/stable/GtkSettings.html">Settings:
-         GTK 4 Reference Manual</ulink>.
-       </para>
-
-    </sect3>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          gtk4-broadwayd,
-          gtk4-builder-tool,
-          gtk4-demo,
-          gtk4-demo-application,
-          gtk4-encode-symbolic-svg,
-          gtk4-icon-browser,
-          gtk4-launch,
-          gtk4-node-editor,
-          gtk4-print-editor,
-          gtk4-query-settings,
-          gtk4-update-icon-cache, and
-          gtk4-widget-factory
-        </seg>
-        <seg>
-          libgtk-4.so
-        </seg>
-        <seg>
-          /usr/include/gtk-4.0,
-          /usr/lib/gtk-4.0, and
-          /usr/share/gtk-4.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gtk4-broadwayd">
-        <term><command>gtk4-broadwayd</command></term>
-        <listitem>
-          <para>
-            provides support for displaying GTK 4 applications in a web
-            browser using HTML5 and web sockets
-          </para>
-          <indexterm zone="gtk4 gtk4-broadwayd">
-            <primary sortas="b-gtk4-broadwayd">gtk4-broadwayd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-builder-tool">
-        <term><command>gtk4-builder-tool</command></term>
-        <listitem>
-          <para>
-            performs various operations on GtkBuilder .ui files
-          </para>
-          <indexterm zone="gtk4 gtk4-builder-tool">
-            <primary sortas="b-gtk4-builder-tool">gtk4-builder-tool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-demo">
-        <term><command>gtk4-demo</command></term>
-        <listitem>
-          <para>
-            is a simple program that demonstrates some of the tasks that can be
-            done with GTK 4
-          </para>
-          <indexterm zone="gtk4 gtk4-demo">
-            <primary sortas="b-gtk4-demo">gtk4-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-demo-application">
-        <term><command>gtk4-demo-application</command></term>
-        <listitem>
-          <para>
-            is a simple GTK 4 application which is useful for testing
-          </para>
-          <indexterm zone="gtk4 gtk4-demo-application">
-            <primary sortas="b-gtk4-demo-application">gtk4-demo-application</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-encode-symbolic-svg">
-        <term><command>gtk4-encode-symbolic-svg</command></term>
-        <listitem>
-          <para>
-            converts symbolic SVG icons into special PNG files. GTK 4 can load
-            and recolor these PNGs, just like original SVGs, but loading them
-            is much faster
-          </para>
-          <indexterm zone="gtk4 gtk4-encode-symbolic-svg">
-            <primary sortas="b-gtk4-encode-symbolic-svg">gtk4-encode-symbolic-svg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-icon-browser">
-        <term><command>gtk4-icon-browser</command></term>
-        <listitem>
-          <para>
-            is a utility to explore the icons in the current icon theme. It
-            shows icons in various sizes, their symbolic variants when
-            available, as well as a description of the icon and its context
-          </para>
-          <indexterm zone="gtk4 gtk4-icon-browser">
-            <primary sortas="b-gtk4-icon-browser">gtk4-icon-browser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-launch">
-        <term><command>gtk4-launch</command></term>
-        <listitem>
-          <para>
-            launches an application using the given name. The name should match
-            the application .desktop file name (as seen in
-            <filename class="directory">/usr/share/applications</filename>),
-            with or without the '.desktop' extension
-          </para>
-          <indexterm zone="gtk4 gtk-launch">
-            <primary sortas="b-gtk4-launch">gtk4-launch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-node-editor">
-        <term><command>gtk4-node-editor</command></term>
-        <listitem>
-          <para>
-            is a utility to show and edit render node files. Such render
-            node files can be obtained e.g. from the GTK inspector
-          </para>
-          <indexterm zone="gtk4 gtk4-node-editor">
-            <primary sortas="b-gtk4-node-editor">gtk4-node-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-print-editor">
-        <term><command>gtk4-print-editor</command></term>
-        <listitem>
-          <para>
-            is a simple program to demonstrate printing using GTK 4
-            applications
-          </para>
-          <indexterm zone="gtk4 gtk4-print-editor">
-            <primary sortas="b-gtk4-print-editor">gtk4-print-editor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-query-settings">
-        <term><command>gtk4-query-settings</command></term>
-        <listitem>
-          <para>
-            provides a complete listing of all settings related to GTK 4
-          </para>
-          <indexterm zone="gtk4 gtk4-query-settings">
-            <primary sortas="b-gtk4-query-settings">gtk4-query-settings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-update-icon-cache">
-        <term><command>gtk4-update-icon-cache</command></term>
-        <listitem>
-          <para>
-            is an icon theme caching utility that creates mmap()able cache
-            files for icon themes
-          </para>
-          <indexterm zone="gtk4 gtk4-update-icon-cache">
-            <primary sortas="b-gtk4-update-icon-cache">gtk4-update-icon-cache</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtk4-widget-factory">
-        <term><command>gtk4-widget-factory</command></term>
-        <listitem>
-          <para>
-            is a program to view GTK 4 themes and widgets
-          </para>
-          <indexterm zone="gtk4 gtk4-widget-factory">
-            <primary sortas="b-gtk4-widget-factory">gtk4-widget-factory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtk-4">
-        <term><filename class="libraryfile">libgtk-4.so</filename></term>
-        <listitem>
-          <para>
-            contains functions that provide an API to implement graphical user
-            interfaces
-          </para>
-          <indexterm zone="gtk4 libgtk-4">
-            <primary sortas="c-libgtk-4">libgtk-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/gtkmm3.xml
===================================================================
--- x/lib/gtkmm3.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 gtkmm3-download-http "&gnome-download-http;/gtkmm/&gnome-minor-24;/gtkmm-&gtkmm3-version;.tar.xz">
-  <!ENTITY gtkmm3-download-ftp  " ">
-  <!ENTITY gtkmm3-md5sum        "47871a7973e186c1189b2145b507de15">
-  <!ENTITY gtkmm3-size          "14 MB">
-  <!ENTITY gtkmm3-buildsize     "200 MB (with tests)">
-  <!ENTITY gtkmm3-time          "1.2 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gtkmm3" xreflabel="Gtkmm-&gtkmm3-version;">
-  <?dbhtml filename="gtkmm3.html"?>
-
-
-  <title>Gtkmm-&gtkmm3-version;</title>
-
-  <indexterm zone="gtkmm3">
-    <primary sortas="a-Gtkmm">Gtkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtkmm</title>
-
-    <para>
-      The <application>Gtkmm</application> package provides a C++ interface to
-      <application>GTK+ 3</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkmm3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkmm3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkmm3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkmm3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkmm3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkmm3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="atkmm"/>,
-      <xref linkend="gtk3"/>, and
-      <xref linkend="pangomm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtkmm</title>
-
-    <para>
-      Install <application>Gtkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir gtkmm3-build &amp;&amp;
-cd    gtkmm3-build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Note that you
-      must be in a graphical environment, as the tests try to open some
-      windows.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you have built the documentation (see Command Explanations below) it
-      was installed to <filename
-      class="directory">/usr/share/doc/gtkmm-3.0</filename>. For consistency,
-      move it to a versioned directory as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>mv -v /usr/share/doc/gtkmm-3.0 /usr/share/doc/gtkmm-&gtkmm3-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: If you have installed
-      <xref linkend="doxygen"/> this define will build and install the
-      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>
-          libgdkmm-3.0.so and libgtkmm-3.0.so
-        </seg>
-        <seg>
-          /usr/include/gdkmm-3.0,
-          /usr/include/gtkmm-3.0,
-          /usr/lib/gdkmm-3.0,
-          /usr/lib/gtkmm-3.0, and optionally
-          /usr/share/{devhelp/books/gtkmm-3.0,doc/gtkmm-&gtkmm3-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdkmm-3">
-        <term><filename class="libraryfile">libgdkmm-3.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the GDK API classes
-        </para>
-          <indexterm zone="gtkmm3 libgdkmm-3">
-            <primary sortas="c-libgdkmm-3">libgdkmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkmm-3">
-        <term><filename class="libraryfile">libgtkmm-3.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the <application>GTK+ 3</application> API classes
-        </para>
-          <indexterm zone="gtkmm3 libgtkmm-3">
-            <primary sortas="c-libgtkmm-3">libgtkmm-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtkmm4.xml
===================================================================
--- x/lib/gtkmm4.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 gtkmm4-download-http "&gnome-download-http;/gtkmm/4.14/gtkmm-&gtkmm4-version;.tar.xz">
-  <!ENTITY gtkmm4-download-ftp  " ">
-  <!ENTITY gtkmm4-md5sum        "2e25e9c3f64793ff8b51bdd24196d78f">
-  <!ENTITY gtkmm4-size          "16 MB">
-  <!ENTITY gtkmm4-buildsize     "206 MB (with tests)">
-  <!ENTITY gtkmm4-time          "1.3 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="gtkmm4" xreflabel="Gtkmm-&gtkmm4-version;">
-  <?dbhtml filename="gtkmm4.html"?>
-
-
-  <title>Gtkmm-&gtkmm4-version;</title>
-
-  <indexterm zone="gtkmm4">
-    <primary sortas="a-Gtkmm">Gtkmm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Gtkmm</title>
-
-    <para>
-      The <application>Gtkmm</application> package provides a C++ interface to
-      <application>GTK-4</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtkmm4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtkmm4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtkmm4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtkmm4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtkmm4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtkmm4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Gtkmm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="atkmm2"/>,
-      <xref linkend="gtk4"/>, and
-      <xref linkend="pangomm2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> and
-      <xref linkend="vulkan-loader"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gtkmm</title>
-
-    <para>
-      Install <application>Gtkmm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir gtkmm4-build &amp;&amp;
-cd    gtkmm4-build &amp;&amp;
-
-meson setup --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>. Note that you
-      must be in a graphical environment, as the tests try to open some
-      windows.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you have built the documentation (see Command Explanations below) it
-      was installed to <filename
-      class="directory">/usr/share/doc/gtkmm-4.0</filename>. For consistency,
-      move it to a versioned directory as the <systemitem
-      class="username">root</systemitem> user:
-    </para>
-
-<screen role="nodump"><userinput>mv -v /usr/share/doc/gtkmm-4.0 /usr/share/doc/gtkmm-&gtkmm4-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <option>-Dbuild-documentation=true</option>: If you have installed
-      <xref linkend="doxygen"/> this define will build and install the
-      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>
-          libgdkmm-4.0.so and libgtkmm-4.0.so
-        </seg>
-        <seg>
-          /usr/include/gdkmm-4.0,
-          /usr/include/gtkmm-4.0,
-          /usr/lib/gdkmm-4.0,
-          /usr/lib/gtkmm-4.0, and optionally
-          /usr/share/{devhelp/books/gtkmm-4.0,doc/gtkmm-&gtkmm4-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgdkmm-4">
-        <term><filename class="libraryfile">libgdkmm-4.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the GDK API classes
-        </para>
-          <indexterm zone="gtkmm4 libgdkmm-4">
-            <primary sortas="c-libgdkmm-4">libgdkmm-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgtkmm-4">
-        <term><filename class="libraryfile">libgtkmm-4.0.so</filename></term>
-        <listitem>
-        <para>
-          contains the <application>GTK 4</application> API classes
-        </para>
-          <indexterm zone="gtkmm4 libgtkmm-4">
-            <primary sortas="c-libgtkmm-4">libgtkmm-4.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtksourceview.xml
===================================================================
--- x/lib/gtksourceview.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 gtksourceview-download-http
-    "&gnome-download-http;/gtksourceview/&gnome-minor-24;/gtksourceview-&gtksourceview-version;.tar.xz">
-  <!ENTITY gtksourceview-download-ftp  " ">
-  <!ENTITY gtksourceview-md5sum        "b748da426a7d64e1304f0c532b0f2a67">
-  <!ENTITY gtksourceview-size          "1.4 MB">
-  <!ENTITY gtksourceview-buildsize     "80 MB (with tests)">
-  <!ENTITY gtksourceview-time          "0.2 SBU (using parallelism=4; with tests)">
-]>
-
-<sect1 id="gtksourceview" xreflabel="gtksourceview-&gtksourceview-version;">
-  <?dbhtml filename="gtksourceview.html"?>
-
-
-  <title>gtksourceview-&gtksourceview-version;</title>
-
-  <indexterm zone="gtksourceview">
-    <primary sortas="a-gtksourceview">gtksourceview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      libraries used for extending the <application>GTK+</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="vala"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="fop"/> (or
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>),
-      and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-    <para>
-      Install <application>GtkSourceView</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 need
-      to be run in a graphical environment.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/gtk-doc-rebuild.xml"/>
-
-  </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>
-          libgtksourceview-3.0.so
-        </seg>
-        <seg>
-          /usr/{include,share,share/gtk-doc/html}/gtksourceview-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-3">
-        <term><filename class="libraryfile">libgtksourceview-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget
-          </para>
-          <indexterm zone="gtksourceview libgtksourceview-3">
-            <primary sortas="c-libgtksourceview-3">libgtksourceview-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtksourceview4.xml
===================================================================
--- x/lib/gtksourceview4.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 gtksourceview4-download-http
-    "&gnome-download-http;/gtksourceview/4.8/gtksourceview-&gtksourceview4-version;.tar.xz">
-  <!ENTITY gtksourceview4-download-ftp  " ">
-  <!ENTITY gtksourceview4-md5sum        "2bf056caaae27654ec3a5930dd5597d3">
-  <!ENTITY gtksourceview4-size          "1.1 MB">
-  <!ENTITY gtksourceview4-buildsize     "71 MB (with tests)">
-  <!ENTITY gtksourceview4-time          "0.1 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="gtksourceview4" xreflabel="gtksourceview4-&gtksourceview4-version;">
-  <?dbhtml filename="gtksourceview4.html"?>
-
-
-  <title>gtksourceview4-&gtksourceview4-version;</title>
-
-  <indexterm zone="gtksourceview4">
-    <primary sortas="a-gtksourceview4">gtksourceview4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      libraries used for extending the <application>GTK+</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview4-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview4-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview4-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview4-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview4-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview4-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/gtksourceview4-&gtksourceview4-version;-buildfix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="vala"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="gtk-doc"/>,
-      <xref linkend="itstool"/>,
-      <xref linkend="fop"/> (or
-      <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>),
-      and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-<!--
-    <para>
-      First, apply a patch to prevent a race condition:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gtksourceview4-&gtksourceview4-version;-buildfix-1.patch</userinput></screen>
--->
-
-    <para>
-      Install <application>GtkSourceView</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>. The tests need
-      to be run in a graphical environment.
-    </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>
-      <option>-Dgtk_doc=true</option>: This option is normally
-      used if <application>GTK-Doc</application> is installed and you wish
-      to rebuild 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>
-          libgtksourceview-4.so
-        </seg>
-        <seg>
-          /usr/{include,share,share/gtk-doc/html}/gtksourceview-4
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-4">
-        <term><filename class="libraryfile">libgtksourceview-4.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget
-          </para>
-          <indexterm zone="gtksourceview4 libgtksourceview-4">
-            <primary sortas="c-libgtksourceview-4">libgtksourceview-4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/gtksourceview5.xml
===================================================================
--- x/lib/gtksourceview5.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 gtksourceview5-download-http "&gnome-download-http;/gtksourceview/5.12/gtksourceview-&gtksourceview5-version;.tar.xz">
-  <!ENTITY gtksourceview5-download-ftp  " ">
-  <!ENTITY gtksourceview5-md5sum        "60ed6cd89cc877c2e7e08d314fa55e02">
-  <!ENTITY gtksourceview5-size          "1.2 MB">
-  <!ENTITY gtksourceview5-buildsize     "47 MB">
-  <!ENTITY gtksourceview5-time          "0.2 SBU (with tests; both using parallelism=4)">
-]>
-
-<sect1 id="gtksourceview5" xreflabel="gtksourceview5-&gtksourceview5-version;">
-  <?dbhtml filename="gtksourceview5.html"?>
-
-
-  <title>gtksourceview5-&gtksourceview5-version;</title>
-
-  <indexterm zone="gtksourceview5">
-    <primary sortas="a-gtksourceview5">gtksourceview5</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to GtkSourceView</title>
-
-    <para>
-      The <application>GtkSourceView</application> package contains
-      a library used for extending the <application>GTK</application>
-      text functions to include syntax highlighting.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&gtksourceview5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&gtksourceview5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &gtksourceview5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &gtksourceview5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &gtksourceview5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &gtksourceview5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">GtkSourceView Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk4"/> and
-      <xref linkend="pcre2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection; and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <!--<xref linkend="sysprof"/>,-->
-      <xref linkend="vala"/>,
-      <xref linkend="valgrind"/>,
-      <xref linkend="vulkan-loader"/>, and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-      <!--<ulink url="https://www.vulkan.org/">Vulkan</ulink>-->
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GtkSourceView</title>
-
-    <para>
-      Install <application>GtkSourceView</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>
-
-    <para>
-      <option>-Ddocumentation=true</option>: Use this switch if you have
-      <xref linkend="gi-docgen"/> installed and wish to generate the API
-      documentation.
-    </para>
-
-    <para>
-      <option>-Dsysprof=true</option>: Use this switch if you have
-      <ulink url="&sysprof-url;">sysprof</ulink> installed and wish to build
-      with sysprof profiler support.
-    </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>
-          libgtksourceview-5.so
-        </seg>
-        <seg>
-          /usr/include/gtksourceview-5 and
-          /usr/share/gtksourceview-5
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgtksourceview-5">
-        <term><filename class="libraryfile">libgtksourceview-5.so</filename></term>
-        <listitem>
-          <para>
-            contains function extensions for the GtkTextView widget
-          </para>
-          <indexterm zone="gtksourceview5 libgtksourceview-5">
-            <primary sortas="c-libgtksourceview-5">libgtksourceview-5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/imlib2.xml
===================================================================
--- x/lib/imlib2.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,299 +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 imlib2-download-http "&sourceforge-dl;/enlightenment/imlib2-&imlib2-version;.tar.xz">
-  <!ENTITY imlib2-download-ftp  " ">
-  <!ENTITY imlib2-md5sum        "046e7b2c918ae612dbf61dea8b59f37a">
-  <!ENTITY imlib2-size          "816 KB">
-  <!ENTITY imlib2-buildsize     "14 MB (with docs)">
-  <!ENTITY imlib2-time          "0.2 SBU (with docs)">
-]>
-
-<sect1 id="imlib2" xreflabel="imlib2-&imlib2-version;">
-  <?dbhtml filename="imlib2.html"?>
-
-
-  <title>imlib2-&imlib2-version;</title>
-
-  <indexterm zone="imlib2">
-    <primary sortas="a-imlib2">imlib2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to imlib2</title>
-
-    <para>
-      <application>imlib2</application> is a graphics library for fast file
-      loading, saving, rendering and manipulation.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&imlib2-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&imlib2-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &imlib2-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &imlib2-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &imlib2-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &imlib2-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">imlib2 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="giflib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for API documentation),
-      <xref linkend="highway"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libjxl"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="x265"/>,
-      <!--<ulink url="https://github.com/google/highway/">highway</ulink>,-->
-      <ulink url="https://github.com/strukturag/libheif">libheif</ulink>,
-      <ulink url="https://sourceforge.net/projects/mad">libid3tag</ulink>,
-      <!--<ulink url="https://jpeg.org/jpegxl/">libjxl</ulink>, and-->
-      <ulink url="https://www.freedesktop.org/wiki/Software/libspectre">libspectre</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of imlib2</title>
-
-    <para>
-      Install <application>imlib2</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 &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <para>
-      If you generated the API documentation, install it as the &root; user:
-    </para>
-
-<screen role="root"><userinput>install -v -m755 -d            /usr/share/doc/imlib2-&imlib2-version;/html &amp;&amp;
-install -v -m644    doc/html/* /usr/share/doc/imlib2-&imlib2-version;/html</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-doc-build</option>: This switch generates
-      the API documentation.  <xref linkend="doxygen"/> must be installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <!-- imlib2-config dropped in 1.7.5 -->
-      <seglistitem>
-        <seg>imlib2_bumpmap,
-             imlib2_colorspace,
-             imlib2_conv,
-             imlib2_grab,
-             imlib2_load,
-             imlib2_poly,
-             imlib2_show,
-             imlib2_test, and
-             imlib2_view</seg>
-        <seg>libImlib2.so and various filters and image loader modules.</seg>
-        <seg>/usr/lib/imlib2, /usr/share/doc/imlib2-&imlib2-version;, and
-        /usr/share/imlib2</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-     <varlistentry id="imlib2_bumpmap">
-        <term><command>imlib2_bumpmap</command></term>
-        <listitem>
-          <para>
-            is to test the <application>imlib2</application> bumpmap function
-          </para>
-          <indexterm zone="imlib2 imlib2_bumpmap">
-            <primary sortas="b-imlib2_bumpmap">imlib2_bumpmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_colorspace">
-        <term><command>imlib2_colorspace</command></term>
-        <listitem>
-          <para>
-            is to test the <application>imlib2</application> colorspace
-            function
-          </para>
-          <indexterm zone="imlib2 imlib2_colorspace">
-            <primary sortas="b-imlib2_colorspace">imlib2_colorspace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="imlib2_conv">
-        <term><command>imlib2_conv</command></term>
-        <listitem>
-          <para>
-            converts images between formats
-          </para>
-          <indexterm zone="imlib2 imlib2_conv">
-            <primary sortas="b-imlib2_conv">imlib2_conv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_grab">
-        <term><command>imlib2_grab</command></term>
-        <listitem>
-          <para>
-            takes screenshots
-          </para>
-          <indexterm zone="imlib2 imlib2_grab">
-            <primary sortas="b-imlib2_grab">imlib2_grab</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="imlib2_load">
-        <term><command>imlib2_load</command></term>
-        <listitem>
-          <para>
-            loads and caches images
-          </para>
-          <indexterm zone="imlib2 imlib2_load">
-            <primary sortas="b-imlib2_load">imlib2_load</primary>
-          </indexterm>
-        </listitem>
-     </varlistentry>
-
-     <varlistentry id="imlib2_poly">
-        <term><command>imlib2_poly</command></term>
-        <listitem>
-          <para>
-            is to test the <application>imlib2</application> poly function
-          </para>
-          <indexterm zone="imlib2 imlib2_poly">
-            <primary sortas="b-imlib2_poly">imlib2_poly</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_show">
-        <term><command>imlib2_show</command></term>
-        <listitem>
-          <para>
-            is an <application>imlib2</application> program test
-          </para>
-          <indexterm zone="imlib2 imlib2_show">
-            <primary sortas="b-imlib2_show">imlib2_show</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="imlib2_test">
-        <term><command>imlib2_test</command></term>
-        <listitem>
-          <para>
-            is an <application>imlib2</application> program test
-          </para>
-          <indexterm zone="imlib2 imlib2_test">
-            <primary sortas="b-imlib2_test">imlib2_test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="imlib2_view">
-        <term><command>imlib2_view</command></term>
-        <listitem>
-          <para>
-            displays image files
-          </para>
-          <indexterm zone="imlib2 imlib2_view">
-            <primary sortas="b-imlib2_view">imlib2_view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libImlib2">
-        <term><filename class="libraryfile">libImlib2.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions for programs to handle various
-            image data formats
-          </para>
-          <indexterm zone="imlib2 libImlib2">
-            <primary sortas="c-libImlib2">libImlib2.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/kcolorpicker.xml
===================================================================
--- x/lib/kcolorpicker.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,131 +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 kcolorpicker-download-http "https://github.com/ksnip/kColorPicker/archive/v&kcolorpicker-version;/kColorPicker-&kcolorpicker-version;.tar.gz">
-  <!ENTITY kcolorpicker-download-ftp  " ">
-  <!ENTITY kcolorpicker-md5sum        "1efc91252446af0d7e5c467ea7d517e7">
-  <!ENTITY kcolorpicker-size          "16 KB">
-  <!ENTITY kcolorpicker-buildsize     "2.4 MB">
-  <!ENTITY kcolorpicker-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="kcolorpicker" xreflabel="kcolorpicker-&kcolorpicker-version;">
-  <?dbhtml filename="kcolorpicker.html"?>
-
-  <title>kColorPicker-&kcolorpicker-version;</title>
-
-  <indexterm zone="kcolorpicker">
-    <primary sortas="a-kcolorpicker">kcolorpicker</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kColorPicker</title>
-
-    <para>
-      kColorPicker is a QToolButton library with a color popup menu, which
-      lets you select colors. The popup menu features a color dialog button
-      which can be used to add custom colors to the popup menu.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kcolorpicker-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kcolorpicker-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kcolorpicker-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kcolorpicker-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kcolorpicker-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kcolorpicker-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kColorPicker Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/> and
-      <xref linkend="qt6"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kColorPicker</title>
-
-    <para>
-      Install <application>kColorPicker</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_SHARED_LIBS=ON      \
-      -DBUILD_WITH_QT6=ON         \
-      .. &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>
-          libkColorPicker.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/kColorPicker
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/keybinder3.xml
===================================================================
--- x/lib/keybinder3.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,165 +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 keybinder3-download-http
-           "https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v&keybinder3-version;/keybinder-3.0-&keybinder3-version;.tar.gz">
-  <!ENTITY keybinder3-download-ftp " ">
-  <!ENTITY keybinder3-md5sum        "97260321fda721fce799174ea6ba10cf">
-  <!ENTITY keybinder3-size          "370 KB">
-  <!ENTITY keybinder3-buildsize     "2.6 MB">
-  <!ENTITY keybinder3-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="keybinder3" xreflabel="keybinder-3.0-&keybinder3-version;">
-  <?dbhtml filename="keybinder-3.html" ?>
-
-
-  <title>keybinder-3.0-&keybinder3-version;</title>
-
-  <indexterm zone="keybinder3">
-    <primary sortas="a-keybinder3">keybinder-3.0</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to keybinder-3.0</title>
-
-    <para>
-      The <application>keybinder-3.0</application> package contains a utility
-      library registering global <application>X</application> keyboard
-      shortcuts for <application>GTK+-3</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&keybinder3-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&keybinder3-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &keybinder3-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &keybinder3-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &keybinder3-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &keybinder3-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">keybinder-3.0 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of keybinder-3.0</title>
-
-    <para>
-      Install <application>keybinder-3.0</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <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>
-          libkeybinder-3.0.so
-        </seg>
-        <seg>
-          /usr/include/keybinder-3.0 and
-          /usr/share/gtk-doc/html/keybinder-3.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="keybinder3-lib">
-        <term><filename class="libraryfile">libkeybinder-3.0.so</filename></term>
-        <listitem>
-          <para>
-            is the library that registers global <application>X</application>
-            keyboard shortcuts
-          </para>
-          <indexterm zone="keybinder3 keybinder3-lib">
-            <primary sortas="c-keybinder3">libkeybinder-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/kimageannotator.xml
===================================================================
--- x/lib/kimageannotator.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,130 +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 kimageannotator-download-http "https://github.com/ksnip/kImageAnnotator/archive/v&kimageannotator-version;/kImageAnnotator-&kimageannotator-version;.tar.gz">
-  <!ENTITY kimageannotator-download-ftp  " ">
-  <!ENTITY kimageannotator-md5sum        "68990dfe7fe03f1aff5e0e5338b9f3bb">
-  <!ENTITY kimageannotator-size          "264 KB">
-  <!ENTITY kimageannotator-buildsize     "31 MB">
-  <!ENTITY kimageannotator-time          "0.6 SBU (Using parallelism=4)">
-]>
-
-<sect1 id="kimageannotator" xreflabel="kimageannotator-&kimageannotator-version;">
-  <?dbhtml filename="kimageannotator.html"?>
-
-  <title>kImageAnnotator-&kimageannotator-version;</title>
-
-  <indexterm zone="kimageannotator">
-    <primary sortas="a-kimageannotator">kimageannotator</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to kImageAnnotator</title>
-
-    <para>
-       kImageAnnotator is a tool for annotating images.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&kimageannotator-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&kimageannotator-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &kimageannotator-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &kimageannotator-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &kimageannotator-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &kimageannotator-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">kImageAnnotator Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="kcolorpicker"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of kImageAnnotator</title>
-
-    <para>
-      Install <application>kImageAnnotator</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_SHARED_LIBS=ON      \
-      -DBUILD_WITH_QT6=ON         \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      Now, as the &root; 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>
-          libkImageAnnotator.so
-        </seg>
-        <seg>
-          /usr/include/kImageAnnotator-Qt6,
-          /usr/lib/cmake/kImageAnnotator-Qt6, and
-          /usr/share/kImageAnnotator
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/lesstif.xml
===================================================================
--- x/lib/lesstif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/lesstif.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,8 @@
+<sect1 id="lesstif" xreflabel="lesstif">
+<?dbhtml filename="lesstif.html" dir="x"?>
+<title>lesstif</title>
+
+<para>TO BE DONE</para>
+
+</sect1>
+
Index: x/lib/lesstif/lesstif.ent
===================================================================
--- x/lib/lesstif/lesstif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/lesstif/lesstif.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,1 @@
+<!ENTITY lesstif SYSTEM "../lesstif.xml">
Index: x/lib/lib.xml
===================================================================
--- x/lib/lib.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ x/lib/lib.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,97 +1,14 @@
-<?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="x-lib">
+<?dbhtml filename="lib.html" dir="x"?>
+<title>X Libraries</title>
 
-<chapter id="x-lib">
-  <?dbhtml filename="lib.html" ?>
-
-  <title>Graphical Environment Libraries</title>
-
-  <para>
-    This chapter does not contain libraries that are required to run
-    <application>X</application>. It does contain libraries that enhance
-    <application>X</application>. In some cases the enhancement is as simple as
-    font support. In others it is as complex as libraries that sit between
-    <application>X</application> and applications that run on
-    <application>X</application> whose purpose is to standardize the look and
-    feel and inter-process communications for different applications. They also
-    assist programmers by supplying common elements.
-  </para>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="amtk.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atkmm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="atkmm2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-core.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="at-spi2-atk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm-1.0.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm-1.16.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cairomm.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cogl.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gst.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="colord-gtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fltk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdk-pixbuf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glslang.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="glu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="goffice010.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="graphene.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-engines.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm2.xml"/>-->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtkmm4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk-vnc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtksourceview5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="imlib2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kcolorpicker.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kimageannotator.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder2.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="keybinder3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libadwaita.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdazzle.xml"/>-->
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libhandy.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libei.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgedit-amtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgedit-gtksourceview.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libhandy1.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdrm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libepoxy.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libglade.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libnotify.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxklavier.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pango.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm2.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-alternate.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5-components.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt6.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebengine.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/> -->
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
-
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>-->
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tepl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulkan-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vulkan-loader.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-desktop-portal.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xdg-desktop-portal-gtk.xml"/>
+&lesstif;
+&qt;
+&GLib;
+&GLib2;
+&GTK;
+&GTK2;
+&ATK;
+&Pango;
 
 </chapter>
Index: x/lib/libadwaita.xml
===================================================================
--- x/lib/libadwaita.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 libadwaita-download-http "&gnome-download-http;/libadwaita/&libadwaita-minor;/libadwaita-&libadwaita-version;.tar.xz">
-  <!ENTITY libadwaita-download-ftp  " ">
-  <!ENTITY libadwaita-md5sum        "71d5d50fc8f36298ef7393b4010baf68">
-  <!ENTITY libadwaita-size          "4.2 MB">
-  <!ENTITY libadwaita-buildsize     "57 MB (with tests)">
-  <!ENTITY libadwaita-time          "0.3 SBU (with parallelism=4; with tests)">
-]>
-
-<sect1 id="libadwaita1" xreflabel="libadwaita-&libadwaita-version;">
-  <?dbhtml filename="libadwaita.html"?>
-
-
-  <title>libadwaita-&libadwaita-version;</title>
-
-  <indexterm zone="libadwaita1">
-    <primary sortas="a-libadwaita">libadwaita</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libadwaita</title>
-
-    <para>
-      The <application>libadwaita</application> package provides additional
-      GTK4 UI widgets for use in developing user interfaces. It is used
-      primarily for GNOME applications.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libadwaita-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libadwaita-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libadwaita-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libadwaita-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libadwaita-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libadwaita-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libadwaita Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="appstream"/> and
-      <xref linkend="gtk4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libadwaita</title>
-
- <!-- Fixed in 1.4.2
-    <para>
-      Adapt some AppStream API usage for AppStream-1.0.0 or later:
-    </para>
-
-<screen><userinput>sed -e "/releases =/s/=.*/ =                             \
-        as_release_list_get_entries                      \
-        (as_component_get_releases_plain (component));/" \
-    -e "/ developer_name =/s/=.*/ =                      \
-        as_developer_get_name                            \
-        (as_component_get_developer (component));/"      \
-    -i src/adw-about-window.c</userinput></screen>
--->
-
-    <para>
-      Install <application>libadwaita</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>
-      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 "s/apiversion/'&libadwaita-version;'/" -i ../doc/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      The tests must be run from a graphical session.
-    </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"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          adwaita-1-demo
-        </seg>
-        <seg>
-          libadwaita-1.so
-        </seg>
-        <seg>
-          /usr/include/libadwaita-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="adwaita-1-demo">
-        <term><command>adwaita-1-demo</command></term>
-        <listitem>
-          <para>
-            provides an example of how to use the
-            <application>libadwaita</application> library
-          </para>
-          <indexterm zone="libadwaita1 adwaita-1-demo">
-            <primary sortas="b-adwaita-1-demo">adwaita-1-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libadwaita-1">
-        <term><filename class="libraryfile">libadwaita-1.so</filename></term>
-        <listitem>
-          <para>
-            provides additional GTK widgets for use in creating user interfaces
-          </para>
-          <indexterm zone="libadwaita1 libadwaita-1">
-            <primary sortas="c-libadwaita-1">libadwaita-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/libdrm.xml
===================================================================
--- x/lib/libdrm.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 libdrm-download-http "https://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.xz">
-  <!ENTITY libdrm-download-ftp  " ">
-  <!ENTITY libdrm-md5sum        "f8521de37ccbd15987b843a83fabd567">
-  <!ENTITY libdrm-size          "472 KB">
-  <!ENTITY libdrm-buildsize     "8.4 MB (with tests)">
-  <!ENTITY libdrm-time          "less than 0.1 SBU (with tests)">
-  <!-- With version 2.4.102, the tests add 1 second to my build. -->
-  <!-- The 'threaded' test adds about 15 seconds if you're on an NVIDIA system
-       due to it directly interacting with the GPU. -->
-]>
-
-<sect1 id="libdrm" xreflabel="libdrm-&libdrm-version;">
-  <?dbhtml filename="libdrm.html"?>
-
-
-  <title>Libdrm-&libdrm-version;</title>
-
-  <indexterm zone="libdrm">
-    <primary sortas="a-libdrm">libdrm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Libdrm</title>
-
-    <para>
-      <application>Libdrm</application> provides a userspace library for
-      accessing the direct rendering manager (DRM) on operating systems that
-      support the ioctl interface. Libdrm is a low-level library, typically used
-      by graphics drivers such as the Mesa DRI drivers, the X drivers, libva and
-      similar projects.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libdrm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libdrm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libdrm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libdrm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libdrm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libdrm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libdrm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="xorg7-lib"/> (for Intel KMS API support required by Mesa)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cairo"/> (for tests),
-      <xref linkend="cmake"/> (could be used to find dependencies without pkgconfig files),
-      <xref linkend="DocBook"/>,
-      <xref linkend="docbook-xsl"/>,
-      <xref linkend="docutils"/>, and
-      <xref linkend="libxslt"/> (to build manual pages),
-      <xref linkend="libatomic_ops"/> (required by architectures without native atomic operations),
-      <xref linkend="valgrind"/>, and
-      <ulink url="https://cunit.sourceforge.net/">CUnit</ulink> (for AMDGPU tests)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libdrm</title>
-
-<!--
-    <para>
-      First fix a problem building the libdrm_intel library:
-    </para>
-
-<screen><userinput>sed -i '/not.*system/s/system/cpu_family/' meson.build</userinput></screen>
--->
-
-    <para>
-      Install <application>libdrm</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=$XORG_PREFIX \
-            --buildtype=release   \
-            -Dudev=true           \
-            -Dvalgrind=disabled   \
-            ..                    &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To check the results, issue <command>ninja test</command>. <!--One test,
-      'threaded' in the nouveau subdirectory, is known to fail with a
-      30 second timeout.-->
-      <!-- Regarding the 'threaded' test, it's now skipped by default (2.4.102)
-           -renodr -->
-
-      <!-- Tests may hang
-      for unknown reasons. --><!-- If nouveau threaded test hangs, you can disable it
-      with
-      <command>sed -i 's/^TESTS/#&amp;/' tests/nouveau/Makefile.in</command>.
-
-      Now that tests are run with ninja, the test merely times out after 30 seconds.
-      -->
-    </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>-Dudev=true</parameter>: This parameter enables support for using
-      <application>Udev</application> instead of <command>mknod</command>.
-    </para>
-
-    <para>
-      <parameter>-Dvalgrind=disabled</parameter>: This parameter disables
-      building libdrm with valgrind support. This fixes building some packages
-      that use libdrm. Change this parameter to "enabled" (or remove it) if you
-      need support for valgrind.
-    </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>
-          libdrm_amdgpu.so, libdrm_intel.so, libdrm_nouveau.so,
-          libdrm_radeon.so, and libdrm.so<!--, and libkms.so-->
-        </seg>
-        <seg>
-           /usr/include/libdrm <!--,/usr/include/libkms,-->
-           and /usr/share/libdrm
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libdrm_amdgpu">
-        <term><filename class="libraryfile">libdrm_amdgpu.so</filename></term>
-        <listitem>
-          <para>
-            contains the AMDGPU specific Direct Rendering Manager functions
-          </para>
-          <indexterm zone="libdrm libdrm_amdgpu">
-            <primary sortas="c-libdrm_amdgpu">libdrm_amdgpu.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_intel">
-        <term><filename class="libraryfile">libdrm_intel.so</filename></term>
-        <listitem>
-          <para>
-            contains the Intel specific Direct Rendering Manager
-            functions
-          </para>
-          <indexterm zone="libdrm libdrm_intel">
-            <primary sortas="c-libdrm_intel">libdrm_intel.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_nouveau">
-        <term><filename class="libraryfile">libdrm_nouveau.so</filename></term>
-        <listitem>
-          <para>
-            contains the open source nVidia (Nouveau) specific Direct
-            Rendering Manager functions
-          </para>
-          <indexterm zone="libdrm libdrm_nouveau">
-            <primary sortas="c-libdrm_nouveau">libdrm_nouveau.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm_radeon">
-        <term><filename class="libraryfile">libdrm_radeon.so</filename></term>
-        <listitem>
-          <para>
-            contains the AMD Radeon specific Direct Rendering Manager
-            functions
-          </para>
-          <indexterm zone="libdrm libdrm_radeon">
-            <primary sortas="c-libdrm_radeon">libdrm_radeon.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdrm-lib">
-        <term><filename class="libraryfile">libdrm.so</filename></term>
-        <listitem>
-          <para>
-            contains the Direct Rendering Manager API functions
-          </para>
-          <indexterm zone="libdrm libdrm-lib">
-            <primary sortas="c-libdrm">libdrm.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <!-- Removed in 2.4.111
-      <varlistentry id="libkms">
-        <term><filename class="libraryfile">libkms.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for kernel mode setting abstraction
-          </para>
-          <indexterm zone="libdrm libkms">
-            <primary sortas="c-libkms">libkms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      -->
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/libei.xml
===================================================================
--- x/lib/libei.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 libei-download-http "https://gitlab.freedesktop.org/libinput/libei/-/archive/&libei-version;/libei-&libei-version;.tar.gz">
-  <!ENTITY libei-download-ftp  " ">
-  <!ENTITY libei-md5sum        "39d18e5c56834d0b3e62b1e2af41a7a5">
-  <!ENTITY libei-size          "228 KB">
-  <!ENTITY libei-buildsize     "5.2 MB">
-  <!ENTITY libei-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libei" xreflabel="libei-&libei-version;">
-  <?dbhtml filename="libei.html"?>
-
-  <title>libei-&libei-version;</title>
-
-  <indexterm zone="libei">
-    <primary sortas="a-libei">libei</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libei</title>
-
-    <para>
-      The <application>libei</application> package contains a set of libraries
-      for handling emulated inputs. It is primarily aimed at the Wayland stack.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libei-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libei-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libei-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libei-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libei-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libei-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libei Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="attrs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <phrase revision="sysv"><xref linkend="elogind"/>,</phrase>
-      <xref linkend="libevdev"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="libxml2"/>, and
-      <ulink url="https://github.com/nemequ/munit">munit</ulink>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libei</title>
-
-    <para>
-      Install <application>libei</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>
-      This package does come with a test suite, but it requires an external
-      dependency. If you have
-      <ulink url="https://github.com/nemequ/munit">munit</ulink> installed and
-      wish to run the test suite, run the following commands:
-    </para>
-
-<screen remap="test"><userinput>meson configure -Dtests=enabled .. &amp;&amp;
-ninja test</userinput></screen>
-
-    <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 switch avoids a dependency
-      on <ulink url="https://github.com/nemequ/munit">munit</ulink>. Remove this
-      switch if you have <application>munit</application> installed and wish to
-      run the test suite.
-    </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>
-          libei.so,
-          libeis.so, and
-          liboeffis.so
-        </seg>
-        <seg>
-          /usr/include/libei-1.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libei-lib">
-        <term><filename class="libraryfile">libei.so</filename></term>
-        <listitem>
-          <para>
-            provides a client side implementation for handling Emulated Input
-          </para>
-          <indexterm zone="libei libei-lib">
-            <primary sortas="c-libei">libei.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="libeis">
-        <term><filename class="libraryfile">libeis.so</filename></term>
-        <listitem>
-          <para>
-            provides a server side implementation for handling Emulated Input
-          </para>
-          <indexterm zone="libei libeis">
-            <primary sortas="c-libeis">libeis.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-      
-      <varlistentry id="liboffis">
-        <term><filename class="libraryfile">liboffis</filename></term>
-        <listitem>
-          <para>
-            provides DBus communication services between libei and the XDG
-            RemoteDesktop portal
-          </para>
-          <indexterm zone="libei liboffis">
-            <primary sortas="c-liboffis">liboffis.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/libepoxy.xml
===================================================================
--- x/lib/libepoxy.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,166 +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 libepoxy-download-http "&gnome-download-http;/libepoxy/&libepoxy-minor;/libepoxy-&libepoxy-version;.tar.xz">
-  <!ENTITY libepoxy-download-ftp  " ">
-  <!ENTITY libepoxy-md5sum        "10c635557904aed5239a4885a7c4efb7">
-  <!ENTITY libepoxy-size          "220 KB">
-  <!ENTITY libepoxy-buildsize     "13 MB (with tests)">
-  <!ENTITY libepoxy-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libepoxy" xreflabel="libepoxy-&libepoxy-version;">
-  <?dbhtml filename="libepoxy.html"?>
-
-
-  <title>libepoxy-&libepoxy-version;</title>
-
-  <indexterm zone="libepoxy">
-    <primary sortas="a-libepoxy">libepoxy</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libepoxy</title>
-
-    <para>
-      <application>libepoxy</application> is a library for handling OpenGL
-      function pointer management.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libepoxy-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libepoxy-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libepoxy-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libepoxy-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libepoxy-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libepoxy-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libepoxy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="mesa"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (for documentation)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libepoxy</title>
-
-    <para>
-      Install <application>libepoxy</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>-Ddocs=true</option>: If you have <xref linkend="doxygen"/>
-      installed, add this option to generate additional 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>
-          libepoxy.so
-        </seg>
-        <seg>
-          /usr/include/epoxy
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-
-      <varlistentry id="libepoxy-lib">
-        <term><filename class="libraryfile">libepoxy.so</filename></term>
-        <listitem>
-          <para>
-            contains API functions for handling OpenGL function
-            pointer management
-          </para>
-          <indexterm zone="libepoxy libepoxy-lib">
-            <primary sortas="c-libepoxy">libepoxy.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/libgedit-amtk.xml
===================================================================
--- x/lib/libgedit-amtk.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 libgedit-amtk-download-http "https://gedit-technology.net/tarballs/libgedit-amtk/libgedit-amtk-&libgedit-amtk-version;.tar.xz">
-  <!ENTITY libgedit-amtk-download-ftp  " ">
-  <!ENTITY libgedit-amtk-md5sum        "1b2ad96c189dd1749b6526c6026e0618">
-  <!ENTITY libgedit-amtk-size          "60 KB">
-  <!ENTITY libgedit-amtk-buildsize     "2.6 MB">
-  <!ENTITY libgedit-amtk-time          "0.1 SBU">
-]>
-
-<sect1 id="libgedit-amtk" xreflabel="libgedit-amtk-&libgedit-amtk-version;">
-  <?dbhtml filename="libgedit-amtk.html"?>
-
-
-  <title>libgedit-amtk-&libgedit-amtk-version;</title>
-
-  <indexterm zone="libgedit-amtk">
-    <primary sortas="a-libgedit-amtk">libgedit-amtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgedit-amtk</title>
-
-    <para>
-      The <application>libgedit-amtk</application> package contains a basic
-      GTKUIManager replacement based on GAction.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgedit-amtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgedit-amtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgedit-amtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgedit-amtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgedit-amtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgedit-amtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgedit-amtk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation) and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgedit-amtk</title>
-
-    <para>
-      Install <application>libgedit-amtk</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir amtk-build &amp;&amp;
-cd    amtk-build &amp;&amp;
-
-meson setup ..              \
-      --prefix=/usr         \
-      --buildtype=release   \
-      -Dgtk_doc=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"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: This switch prevents the build
-      system from generating and installing the API documentation. Omit this
-      switch if you have <xref linkend="gtk-doc" role="nodep"/> installed and
-      wish to generate 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>
-          None
-        </seg>
-        <seg>
-          libgedit-amtk-5.so
-        </seg>
-        <seg>
-          /usr/include/libgedit-amtk-5 and
-          /usr/share/gtk-doc/html/libgedit-amtk-5.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgedit-amtk-5">
-        <term><filename class="libraryfile">libgedit-amtk-5.so</filename></term>
-        <listitem>
-          <para>
-            provides a basic GTKUIManager replacement API based on GAction
-          </para>
-          <indexterm zone="libgedit-amtk libgedit-amtk-5">
-            <primary sortas="c-libgedit-amtk-5">libgedit-amtk-5.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/libgedit-gtksourceview.xml
===================================================================
--- x/lib/libgedit-gtksourceview.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 libgedit-gtksourceview-download-http "https://github.com/gedit-technology/libgedit-gtksourceview/releases/download/&libgedit-gtksourceview-version;/libgedit-gtksourceview-&libgedit-gtksourceview-version;.tar.xz">
-  <!ENTITY libgedit-gtksourceview-download-ftp  " ">
-  <!ENTITY libgedit-gtksourceview-md5sum        "8ab58c6373c6f4e738b02688ff9788d3">
-  <!ENTITY libgedit-gtksourceview-size          "636 KB">
-  <!ENTITY libgedit-gtksourceview-buildsize     "22 MB (with tests)">
-  <!ENTITY libgedit-gtksourceview-time          "0.4 SBU (with tests)">
-
-]>
-
-<sect1 id="libgedit" xreflabel="libgeditsourceview-&libgedit-gtksourceview-version;">
-  <?dbhtml filename="libgedit-gtksourceview.html"?>
-
-
-  <title>libgedit-gtksourceview-&libgedit-gtksourceview-version;</title>
-
-  <indexterm zone="libgedit">
-    <primary sortas="a-libgedit-gtksourceview">libgedit-gtksourceview</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libgedit-gtksourceview</title>
-
-    <para>
-      The <application>libgedit-gtksourceview</application> package
-      provides a library that extends GtkTextView.
-      This library adds support for syntax highlighting, undo/redo,
-      file loading and saving, search and replace, a
-      completion system, printing, displaying line numbers, and
-      other features typical of a source code editor.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libgedit-gtksourceview-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libgedit-gtksourceview-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libgedit-gtksourceview-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libgedit-gtksourceview-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libgedit-gtksourceview-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libgedit-gtksourceview-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libgedit-gtksourceview Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="libxml2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libgedit-gtksourceview</title>
-
-    <para>
-      Install <application>libgedit-gtksourceview</application> by
-      running the following commands:
-    </para>
-
-<screen><userinput>mkdir build-libgedit &amp;&amp;
-cd    build-libgedit &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=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"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Disables building the API
-      documentation. Remove if you have <xref linkend="gtk-doc"/> installed
-      and wish to build 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>
-          libgedit-gtksourceview-300.so
-        </seg>
-        <seg>
-          /usr/include/libgedit-gtksourceview-300 and
-          /usr/share/libgedit-gtksourceview-300
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgedit-gtksourceview-300">
-        <term><filename class="libraryfile">
-           libgedit-gtksourceview-300.so</filename></term>
-        <listitem>
-          <para>
-            contains convenience functions for text editing.
-          </para>
-          <indexterm zone="libgedit libgedit-gtksourceview-300">
-            <primary sortas="c-liblibgedit-gtksourceview-300">
-              liblibgedit-gtksourceview-300.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/libglade.xml
===================================================================
--- x/lib/libglade.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,181 +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 libglade-download-http "&gnome-download-http;/libglade/2.6/libglade-&libglade-version;.tar.bz2">
-  <!ENTITY libglade-download-ftp  " ">
-  <!ENTITY libglade-md5sum        "d1776b40f4e166b5e9c107f1c8fe4139">
-  <!ENTITY libglade-size          "348 KB">
-  <!ENTITY libglade-buildsize     "5 MB">
-  <!ENTITY libglade-time          "0.1 SBU">
-]>
-
-<sect1 id="libglade" xreflabel="libglade-&libglade-version;">
-  <?dbhtml filename="libglade.html"?>
-
-
-  <title>libglade-&libglade-version;</title>
-
-  <indexterm zone="libglade">
-    <primary sortas="a-Libglade">Libglade</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libglade</title>
-
-    <para>
-      The <application>libglade</application> package contains
-      <filename class="libraryfile">libglade</filename> libraries. These are
-      useful for loading Glade interface files in a program at runtime.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libglade-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libglade-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libglade-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libglade-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libglade-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libglade-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libglade Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="libxml2"/> and
-      <xref linkend="gtk2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="python2"/> and
-      <xref linkend="gtk-doc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libglade</title>
-
-    <para>
-      Install <application>libglade</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in &amp;&amp;
-./configure --prefix=/usr --disable-static &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-      One of the tests, test-convert, is known to fail.
-    </para>
-    <!-- on this build run (2018-08-14), the tests skipped. Need to see if
-         there are any functionality issues later. -->
-
-    <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 '/DG_DISABLE_DEPRECATED/d'</command>: Some of the
-      <application>glib</application> functions that
-      <application>libglade</application> uses were declared deprecated in
-      glib-2.30. This sed removes the G_DISABLE_DEPRECATED CFLAG.
-    </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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>libglade-convert (requires <command>python</command>)</seg>
-        <seg>libglade-2.0.so</seg>
-        <seg>/usr/{include/libglade-2.0/glade,share/{gtk-doc/html/libglade,
-        xml/libglade}}</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libglade-convert">
-        <term><command>libglade-convert</command></term>
-        <listitem>
-          <para>
-            is used to convert old Glade interface files to
-            Glade-2.0 standards
-          </para>
-          <indexterm zone="libglade libglade-convert">
-            <primary sortas="b-libglade-convert">libglade-convert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libglade-lib">
-        <term><filename class="libraryfile">libglade-2.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the functions necessary to load Glade interface files
-          </para>
-          <indexterm zone="libglade libglade-lib">
-            <primary sortas="c-libglade-2.0">libglade-2.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/libhandy1.xml
===================================================================
--- x/lib/libhandy1.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,181 +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 libhandy1-download-http "&gnome-download-http;/libhandy/1.8/libhandy-&libhandy1-version;.tar.xz">
-  <!ENTITY libhandy1-download-ftp  " ">
-  <!ENTITY libhandy1-md5sum        "af586a91ff6d4093a6e7e283dfab5f7f">
-  <!ENTITY libhandy1-size          "1.8 MB">
-  <!ENTITY libhandy1-buildsize     "24 MB (with tests)">
-  <!ENTITY libhandy1-time          "0.1 SBU (with tests)">
-]>
-
-<sect1 id="libhandy1" xreflabel="libhandy-&libhandy1-version;">
-  <?dbhtml filename="libhandy1.html"?>
-
-
-  <title>libhandy-&libhandy1-version;</title>
-
-  <indexterm zone="libhandy1">
-    <primary sortas="a-libhandy1">libhandy1</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libhandy</title>
-
-    <para>
-      The <application>libhandy</application> package provides additional
-      GTK UI widgets for use in developing user interfaces.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libhandy1-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libhandy1-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libhandy1-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libhandy1-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libhandy1-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libhandy1-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libhandy Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="vala"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <ulink url="https://glade.gnome.org/">Glade</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libhandy</title>
-
-    <para>
-      Install <application>libhandy</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>.
-      The tests must be run from a graphical session.
-    </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 you have
-      <xref linkend="gtk-doc"/> installed and wish to install the documentation.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          handy-1-demo
-        </seg>
-        <seg>
-          libhandy-1.so
-        </seg>
-        <seg>
-          /usr/include/libhandy-1
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="handy-1-demo">
-        <term><command>handy-1-demo</command></term>
-        <listitem>
-          <para>
-            provides an example of how to use the
-            <application>libhandy</application> library
-          </para>
-          <indexterm zone="libhandy1 handy-1-demo">
-            <primary sortas="b-handy-1-demo">handy-1-demo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libhandy-1">
-        <term><filename class="libraryfile">libhandy-1.so</filename></term>
-        <listitem>
-          <para>
-            provides additional GTK widgets for use in creating user interfaces
-          </para>
-          <indexterm zone="libhandy1 libhandy-1">
-            <primary sortas="c-libhandy-1">libhandy-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/libnotify.xml
===================================================================
--- x/lib/libnotify.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,214 +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 libnotify-download-http "&gnome-download-http;/libnotify/0.8/libnotify-&libnotify-version;.tar.xz">
-  <!ENTITY libnotify-download-ftp  " ">
-  <!ENTITY libnotify-md5sum        "952e55f45067b6a5b9eab4310c9cd658">
-  <!ENTITY libnotify-size          "104 KB">
-  <!ENTITY libnotify-buildsize     "2.3 MB">
-  <!ENTITY libnotify-time          "0.1 SBU">
-]>
-
-<sect1 id="libnotify" xreflabel="libnotify-&libnotify-version;">
-  <?dbhtml filename="libnotify.html"?>
-
-
-  <title>libnotify-&libnotify-version;</title>
-
-  <indexterm zone="libnotify">
-    <primary sortas="a-libnotify">libnotify</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libnotify</title>
-
-    <para>
-      The <application>libnotify</application> library is used to send desktop
-      notifications to a notification daemon, as defined in the Desktop
-      Notifications spec. These notifications can be used to inform the user about
-      an event or display some form of information without getting in the user's
-      way.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libnotify-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libnotify-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libnotify-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libnotify-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libnotify-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libnotify-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libnotify Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional (Required if building GNOME)</bridgehead>
-    <para role="optional">
-      &gobject-introspection;
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/> and
-      <xref linkend="xmlto"/>
-    </para>
-
-    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
-    <para role="required">
-      <xref role="runtime" linkend="notification-daemon"/>,
-      <xref role="nodep" linkend="xfce4-notifyd"/>, or
-      <xref role="nodep" linkend="lxqt-notificationd"/>
-    </para>
-
-    <note>
-      <para>
-        <application>GNOME Shell</application> and
-        <application>KDE KWin</application>
-        provide their own notification daemons.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libnotify</title>
-
-    <para>
-      Install <application>libnotify</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=false     \
-            -Dman=false         \
-            ..                  &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>
-      If you have <xref linkend='gi-docgen'/> installed and wish to build
-      the API documentation for this package, issue:
-    </para>
-
-    <!-- No &libnotify-version; here because we'll mv the doc dir anyway -->
-<screen remap='doc'><userinput>sed "/docs_dir =/s@\$@ / 'libnotify'@" \
-    -i ../docs/reference/meson.build   &amp;&amp;
-meson configure -Dgtk_doc=true         &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-if [ -e /usr/share/doc/libnotify ]; then
-  rm -rf /usr/share/doc/libnotify-&libnotify-version;
-  mv -v  /usr/share/doc/libnotify{,-&libnotify-version;}
-fi</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 Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          notify-send
-        </seg>
-        <seg>
-          libnotify.so
-        </seg>
-        <seg>
-         /usr/include/libnotify and
-         /usr/share/gtk-doc/html/libnotify
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="notify-send">
-        <term><command>notify-send</command></term>
-        <listitem>
-          <para>
-            is a command used to send notifications
-          </para>
-          <indexterm zone="libnotify notify-send">
-            <primary sortas="b-notify-send">notify-send</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnotify-lib">
-        <term><filename class="libraryfile">libnotify.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>libnotify</application> API functions
-          </para>
-          <indexterm zone="libnotify libnotify">
-            <primary sortas="c-libnotify">libnotify.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/libxklavier.xml
===================================================================
--- x/lib/libxklavier.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 libxklavier-download-http "https://people.freedesktop.org/~svu/libxklavier-&libxklavier-version;.tar.bz2">
-  <!ENTITY libxklavier-download-ftp  " ">
-  <!ENTITY libxklavier-md5sum        "13af74dcb6011ecedf1e3ed122bd31fa">
-  <!ENTITY libxklavier-size          "384 KB">
-  <!ENTITY libxklavier-buildsize     "5.2 MB">
-  <!ENTITY libxklavier-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="libxklavier" xreflabel="libxklavier-&libxklavier-version;">
-  <?dbhtml filename="libxklavier.html" ?>
-
-
-  <title>libxklavier-&libxklavier-version;</title>
-
-  <indexterm zone="libxklavier">
-    <primary sortas="a-libxklavier">libxklavier</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libxklavier</title>
-
-    <para>
-      The <application>libxklavier</application> package contains a
-      utility library for <application>X</application> keyboard.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&libxklavier-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&libxklavier-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &libxklavier-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &libxklavier-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &libxklavier-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &libxklavier-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">libxklavier Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/> (GObject Introspection recommended),
-      <xref linkend="iso-codes"/>,
-      <xref linkend="libxml2"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> and
-      <xref linkend="vala"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libxklavier</title>
-
-    <para>
-      Install <application>libxklavier</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"/>
-
-    <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 Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libxklavier.so
-        </seg>
-        <seg>
-          /usr/include/libxklavier and
-          /usr/share/gtk-doc/html/libxklavier
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libxklavier-lib">
-        <term><filename class="libraryfile">libxklavier.so</filename></term>
-        <listitem>
-          <para>
-            contains XKB utility functions
-          </para>
-          <indexterm zone="libxklavier libxklavier-lib">
-            <primary sortas="c-libxklavier">libxklavier.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/pango.xml
===================================================================
--- x/lib/pango.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ x/lib/pango.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -1,294 +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="Pango" xreflabel="Pango-&Pango-version;">
+<?dbhtml filename="pango.html" dir="x"?>
+<title>Pango-&Pango-version;</title>
 
-  <!ENTITY pango-download-http "&gnome-download-http;/pango/&pango-minor;/pango-&pango-version;.tar.xz">
-  <!ENTITY pango-download-ftp  " ">
-  <!ENTITY pango-md5sum        "ed3c57bdaff980ddc4c840919ce512ac">
-  <!ENTITY pango-size          "1.8 MB">
-  <!ENTITY pango-buildsize     "28 MB (with tests)">
-  <!ENTITY pango-time          "0.1 SBU (Using parallelism=4; with tests)">
-]>
-
-<sect1 id="pango" xreflabel="Pango-&pango-version;">
-  <?dbhtml filename="pango.html" ?>
-
-
-  <title>Pango-&pango-version;</title>
-
-  <indexterm zone="pango">
-    <primary sortas="a-Pango">Pango</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pango</title>
-
-    <para>
-      <application>Pango</application> is a library for laying out and rendering
-      text, with an emphasis on internationalization. It can be used anywhere
-      that text layout is needed, though most of the work on
-      <application>Pango</application> so far has been done in the context of
-      the <application>GTK+</application> widget toolkit.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pango-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pango-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pango-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pango-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pango-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pango-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pango Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fontconfig"/> (must be built with
-       <xref linkend="freetype2"/> using <xref linkend="harfbuzz"/>),
-      <xref linkend="fribidi"/>, and
-      <xref linkend="glib2"/> (GObject Introspection required for GNOME)
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="cairo"/> and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="cantarell-fonts"/> (for tests),
-  <!--<xref linkend="gtk-doc"/>,-->
-  <!--<xref linkend="sysprof"/>,-->
-      <xref linkend="gi-docgen"/> (to generate documentation),
-      <ulink url="https://ftpmirror.gnu.org/gnu/help2man">help2man</ulink>,
-      <ulink url="https://linux.thai.net/projects/libthai">libthai</ulink>, and
-      <ulink url="&sysprof-url;">sysprof</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pango</title>
-
-    <para>
-      Install <application>Pango</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson setup --prefix=/usr          \
-            --buildtype=release    \
-            --wrap-mode=nofallback \
-            ..                     &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 "/docs_dir =/s@\$@ / 'pango-&pango-version;'@" -i ../docs/meson.build &amp;&amp;
-meson configure -Dgtk_doc=true                                   &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      One test (test-layout) is known to fail on i686 systems for
-      unknown reason.
-      <!-- One test,
-      <filename>test-font</filename> is known to fail.  Some tests may
-      fail if no Opentype or Truetype fonts are installed in
-      <filename class='directory'>/usr/share/fonts</filename>.
-      -->
-      <!--<filename>test-itemize</filename>, are are known to fail. if
-      <xref linkend="cantarell-fonts"/> are not installed.-->
-      <!-- the other problematic tests get skipped now -->
-      <!-- Even with cantarell-fonts, pango-1.50.9 test-font fails again. -->
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-<!--
-This requires the external help2man program to generate pango-view.1.  The version
-from lsb_release is insufficient.  I'm not sure if the command below is needed
-or not if the newer help2man is present. - Bruce
-
-install -vm 644 ../utils/pango-view.1.in /usr/share/man/man1/pango-view.1</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>-Dintrospection=disabled</option>: Use this switch if you do not
-      want to use GObject Introspection.
-    </para>
-
-    <!-- gi-docgen can get installed without this, if deps exist -->
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nofallback.xml"/>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Pango</title>
-
-    <sect3 id="pango-config">
-      <title>Config Files</title>
-
-      <para>
-        <filename>/etc/pango/pangorc</filename>, <filename>~/.pangorc</filename>
-        and the file specified in the environment variable
-        <envar>PANGO_RC_FILE</envar>
-      </para>
-
-      <indexterm zone="pango pango-config">
-        <primary sortas="e-etc-pango-pangorc">/etc/pango/pangorc</primary>
-      </indexterm>
-
-      <indexterm zone="pango pango-config">
-        <primary sortas="e-AA.pangorc">~/.pangorc</primary>
-      </indexterm>
-    </sect3>
-<!--
-    <sect3>
-      <title>Configuration Information</title>
-
-      <para>
-        The <application>Pango</application> module path is specified by the key
-        <userinput><parameter>Pango/ModulesPath</parameter></userinput> in the
-        <application>Pango</application> config database, which is read from the
-        config files listed above.
-      </para>
-
-    </sect3>-->
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          pango-list, pango-segmentation, and pango-view
-        </seg>
-        <seg>
-          libpango-1.0.so, libpangocairo-1.0.so, libpangoft2-1.0.so,
-          and libpangoxft-1.0.so
-        </seg>
-        <seg>
-          /usr/include/pango-1.0 and
-          /usr/share/doc/pango-&pango-version; (if gi-docgen is available)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="pango-list">
-        <term><command>pango-list</command></term>
-        <listitem>
-          <para>
-            displays a list of fonts that <application>Pango</application>
-            can use that are currently installed on the system
-          </para>
-          <indexterm zone="pango pango-list">
-            <primary sortas="b-pango-list">pango-list</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pango-segmentation">
-        <term><command>pango-segmentation</command></term>
-        <listitem>
-          <para>
-            shows text segmentation as determined by Pango.
-          </para>
-          <indexterm zone="pango pango-segmentation">
-            <primary sortas="b-pango-segmentation">pango-segmentation</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pango-view">
-        <term><command>pango-view</command></term>
-        <listitem>
-          <para>
-            renders a given text file through <application>Pango</application>
-            for viewing purposes
-          </para>
-          <indexterm zone="pango pango-view">
-            <primary sortas="b-pango-view">pango-view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpango-1">
-        <term><filename class="libraryfile">libpango-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains low level layout rendering routines, a high level driver for
-            laying out entire blocks of text, and routines to assist in editing
-            internationalized text
-          </para>
-          <indexterm zone="pango libpango-1">
-            <primary sortas="c-libpango-1">libpango-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+&Pango-intro;
+&Pango-inst;
+&Pango-config;
+&Pango-desc;
 
 </sect1>
+
Index: x/lib/pango/pango-config.xml
===================================================================
--- x/lib/pango/pango-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Configuring Pango</title>
+
+<sect3><title>Configuration Information</title>
+
+&library-config;
+
+</sect3>
+
+</sect2>
+
Index: x/lib/pango/pango-desc.xml
===================================================================
--- x/lib/pango/pango-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Contents</title>
+
+<para>The pango package contains <userinput>Pango libraries</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>Pango libraries</title>
+<para>Pango libraries contains low level layout rendering routines, a
+high level driver for laying out entire blocks of text, and routines to
+assist in editing internationalized text.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/pango/pango-inst.xml
===================================================================
--- x/lib/pango/pango-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,11 @@
+<sect2>
+<title>Installation of Pango</title>
+
+<para>Install Pango by running the following commands:</para>
+
+<para><screen><userinput>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/pango/pango-intro.xml
===================================================================
--- x/lib/pango/pango-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to Pango</title>
+
+<screen>Download location:              <ulink url="&Pango-download;"/>
+Version used:                   &Pango-version;
+Package size:                   &Pango-size;
+Estimated Disk space required:  &Pango-buildsize;</screen>
+
+<para>The Pango package contains the pango library. This is useful for
+the layout and rendering of of text.</para>
+
+<screen>Pango depends on:
+<xref linkend="GLib2"/>
+Pango will utilize:
+freetype2 and <xref linkend="xfree86"/> if installed prior to pango. </screen>
+
+</sect2>
Index: x/lib/pango/pango.ent
===================================================================
--- x/lib/pango/pango.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/pango/pango.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,9 @@
+<!ENTITY Pango SYSTEM "../pango.xml">
+<!ENTITY Pango-intro SYSTEM "pango-intro.xml">
+<!ENTITY Pango-inst SYSTEM "pango-inst.xml">
+<!ENTITY Pango-config SYSTEM "pango-config.xml">
+<!ENTITY Pango-desc SYSTEM "pango-desc.xml">
+<!ENTITY Pango-buildsize "10 MB">
+<!ENTITY Pango-version "1.0.3">
+<!ENTITY Pango-download "ftp://ftp.gtk.org/pub/gtk/v2.0/pango-1.0.3.tar.gz">
+<!ENTITY Pango-size "1.1 MB">
Index: x/lib/pangomm.xml
===================================================================
--- x/lib/pangomm.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,150 +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 pangomm-download-http "&gnome-download-http;/pangomm/2.46/pangomm-&pangomm-version;.tar.xz">
-  <!ENTITY pangomm-download-ftp  " ">
-  <!ENTITY pangomm-md5sum        "5947d35899db62813531d7ea8faee60c">
-  <!ENTITY pangomm-size          "680 KB">
-  <!ENTITY pangomm-buildsize     "8.9 MB">
-  <!ENTITY pangomm-time          "0.2 SBU">
-]>
-
-<sect1 id="pangomm" xreflabel="Pangomm-&pangomm-version;">
-  <?dbhtml filename="pangomm.html"?>
-
-
-  <title>Pangomm-&pangomm-version;</title>
-
-  <indexterm zone="pangomm">
-    <primary sortas="a-Pangomm">Pangomm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pangomm</title>
-
-    <para>
-      The <application>Pangomm</application> package provides a C++
-      interface to <application>Pango</application>.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&pangomm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pangomm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pangomm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pangomm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pangomm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pangomm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pangomm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairomm-1.0"/>,
-      <xref linkend="glibmm"/> and
-      <xref linkend="pango"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pangomm</title>
-
-    <para>
-      Install <application>Pangomm</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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpangomm-1.4.so
-        </seg>
-        <seg>
-          /usr/include/pangomm-1.4,
-          /usr/lib/pangomm-1.4, and
-          /usr/share/{devhelp/books/pangomm-1.4,doc/pangomm-&pangomm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpangomm-1">
-        <term><filename class="libraryfile">libpangomm-1.4.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Pango</application> API classes
-          </para>
-          <indexterm zone="pangomm libpangomm-1">
-            <primary sortas="c-libpangomm-1">libpangomm-1.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/pangomm2.xml
===================================================================
--- x/lib/pangomm2.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 pangomm-download-http "&gnome-download-http;/pangomm/2.52/pangomm-&pangomm2-version;.tar.xz">
-  <!ENTITY pangomm-download-ftp  " ">
-  <!ENTITY pangomm-md5sum        "fea622c95dce2f0300d83a73f5478ba4">
-  <!ENTITY pangomm-size          "764 KB">
-  <!ENTITY pangomm-buildsize     "12 MB">
-  <!ENTITY pangomm-time          "0.2 SBU">
-]>
-
-<sect1 id="pangomm2" xreflabel="Pangomm-&pangomm2-version;">
-  <?dbhtml filename="pangomm2.html"?>
-
-
-  <title>Pangomm-&pangomm2-version;</title>
-
-  <indexterm zone="pangomm2">
-    <primary sortas="a-Pangomm2">Pangomm</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Pangomm</title>
-
-    <para>
-      The <application>Pangomm</application> package provides a C++
-      interface to <application>Pango</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="&pangomm-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&pangomm-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &pangomm-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &pangomm-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &pangomm-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &pangomm-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Pangomm Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairomm-1.16"/>,
-      <xref linkend="glibmm2"/> and
-      <xref linkend="pango"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Pangomm</title>
-
-    <para>
-      Install <application>Pangomm</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="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libpangomm-2.48.so
-        </seg>
-        <seg>
-          /usr/include/pangomm-2.48,
-          /usr/lib/pangomm-2.48, and
-          /usr/share/{devhelp/books/pangomm-2.48,doc/pangomm-&pangomm-version;}
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libpangomm-2">
-        <term><filename class="libraryfile">libpangomm-2.48.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>Pango</application> API classes
-          </para>
-          <indexterm zone="pangomm2 libpangomm-2">
-            <primary sortas="c-libpangomm-2">libpangomm-2.48.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/qt.xml
===================================================================
--- x/lib/qt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect1 id="qt" xreflabel="qt-&qt-version;">
+<?dbhtml filename="qt.html" dir="x"?>
+<title>qt-&qt-version;</title>
+
+&qt-intro;
+&qt-inst;
+&qt1-intro;
+&qt1-inst;
+&qt-exp;
+&qt-config;
+&qt-desc;
+
+</sect1>
+
Index: x/lib/qt/qt-config.xml
===================================================================
--- x/lib/qt/qt-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-config.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,39 @@
+<sect2>
+<title>Configuring qt</title>
+
+<sect3><title>Configuration Information</title>
+
+<para>As with most libraries, there is no configuration to do, save that
+the library directory <userinput>/opt/qt/lib</userinput> should appear
+in <userinput>/etc/ld.so.conf</userinput> so that ldd can find the
+shared libraries. The following command will add it if it is missing:</para>
+
+<para><screen><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"</userinput>
+# Begin qt addition to /etc/ld.so.conf
+
+/opt/qt/lib
+
+# End qt addition
+<userinput>EOF
+ldconfig</userinput></screen></para>
+
+<para>You need to set a QTDIR environment variable which can be accomplished
+by putting the following in your ~/.bash_profile and/or ~/.bashrc:
+<screen><userinput>export QTDIR=/opt/qt
+export PATH=$PATH:$QTDIR/bin</userinput></screen></para>
+
+<para>You need to add the path for the qt man pages to the man.conf
+file.  This can be done with the following command:</para>
+
+<para><screen><userinput>cat &gt;&gt; /etc/man.conf &lt;&lt; "EOF"</userinput>
+# Begin qt addition to man.conf
+
+MANPATH /opt/qt/doc/man
+
+# End qt addition to man.conf
+<userinput>EOF</userinput></screen></para>
+
+</sect3>
+
+</sect2>
+
Index: x/lib/qt/qt-desc.xml
===================================================================
--- x/lib/qt/qt-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-desc.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,15 @@
+<sect2>
+<title>Contents</title>
+
+<para>The qt package contains the <userinput>qt library</userinput>.</para>
+
+</sect2>
+
+<sect2><title>Description</title>
+
+<sect3><title>qt library</title>
+<para>The QT/X11 library contains API's necessary to use KDE programs.</para></sect3>
+
+
+</sect2>
+
Index: x/lib/qt/qt-exp.xml
===================================================================
--- x/lib/qt/qt-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-exp.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Command explanations</title>
+
+<para><userinput>-prefix /opt/qt-&qt-version;:</userinput> This command sets up
+the install destination.</para>
+
+<para><userinput>-qt-gif:</userinput> This command adds support for gif
+files to the libraries.</para>
+
+<para><userinput>-system-libpng -system-libmng -system-zlib
+-system-libjpeg:</userinput> This command forces the library to use the
+shared libraries that are on your system instead of recreating its own
+set of support libraries for these functions.</para>
+
+<para><userinput>-no-g++-exceptions:</userinput> This command disables
+the exceptions coding generated by the C++ compiler.</para>
+
+<para><userinput>-thread:</userinput> This command compiles the library
+to support multi-threading.</para>
+
+<para><userinput>ln -sf /opt/qt-&qt-version; /opt/qt:</userinput> This command
+standardizes the location of the qt libraries to the ld.so.conf entry
+described below.</para>
+
+</sect2>
+
Index: x/lib/qt/qt-inst.xml
===================================================================
--- x/lib/qt/qt-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,24 @@
+<sect2>
+<title>Installation of qt</title>
+
+<para><screen><userinput>export QTDIR=$PWD &amp;&amp;
+./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
+   -system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
+   -thread &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ln -sf /opt/qt-&qt-version; /opt/qt &amp;&amp;
+cp -r doc/man /opt/qt/doc</userinput></screen></para>
+
+<note><para>
+The build time for qt is quite long.  If you want to save some time and don't want the 
+tutorials and examples, change the first make line above to:
+</para>
+
+<para>
+<userinput>make symlinks src-qmake src-moc sub-src sub-tools</userinput>
+</para>
+</note>
+
+</sect2>
+
Index: x/lib/qt/qt-intro.xml
===================================================================
--- x/lib/qt/qt-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,17 @@
+<sect2>
+<title>Introduction to qt</title>
+
+<screen>Download location:              <ulink url="&qt-download;"/>
+Version used:                   &qt-version;
+Package size:                   &qt-size;
+Estimated Disk space required:  &qt-buildsize;</screen>
+
+<para>The qt package contains the C++ GUI library. This is useful for
+creating graphical applications or executing graphical applications that
+are dynamically linked to the qt library.</para>
+
+<screen>qt depends on:
+<xref linkend="xfree86"/>, <xref linkend="zlib"/>, <xref linkend="libpng"/>, <xref
+linkend="libmng"/>, and <xref linkend="libjpeg"/></screen>
+
+</sect2>
Index: x/lib/qt/qt.ent
===================================================================
--- x/lib/qt/qt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt.ent	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,12 @@
+<!ENTITY qt SYSTEM "../qt.xml">
+<!ENTITY qt-intro SYSTEM "qt-intro.xml">
+<!ENTITY qt-inst SYSTEM "qt-inst.xml">
+<!ENTITY qt1-intro SYSTEM "qt1-intro.xml">
+<!ENTITY qt1-inst SYSTEM "qt1-inst.xml">
+<!ENTITY qt-exp SYSTEM "qt-exp.xml">
+<!ENTITY qt-desc SYSTEM "qt-desc.xml">
+<!ENTITY qt-config SYSTEM "qt-config.xml">
+<!ENTITY qt-buildsize "147 MB">
+<!ENTITY qt-version "3.0.4">
+<!ENTITY qt-download "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.4.tar.gz">
+<!ENTITY qt-size "15 MB">
Index: x/lib/qt/qt1-inst.xml
===================================================================
--- x/lib/qt/qt1-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt1-inst.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,19 @@
+<sect2>
+<title>Installation of qt using objprelink</title>
+
+<para><screen><userinput>export QTDIR=$PWD &amp;&amp;
+cd mkspecs/linux-g++ &amp;&amp;
+cp qmake.conf qmake.conf.bak &amp;&amp;
+sed '/^QMAKE_LINK/s/g++/objprelink $(OBJECTS) $(OBJMOC) \&\& g++/' \
+   qmake.conf.bak > qmake.conf &amp;&amp;
+cd ../.. &amp;&amp;
+./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
+   -system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
+   -thread &amp;&amp;
+make &amp;&amp;
+make install &amp;&amp;
+ln -sf /opt/qt-&qt-version; /opt/qt &amp;&amp;
+cp -r doc/man /opt/qt/doc</userinput></screen></para>
+
+</sect2>
+
Index: x/lib/qt/qt1-intro.xml
===================================================================
--- x/lib/qt/qt1-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
+++ x/lib/qt/qt1-intro.xml	(revision f45b195302d36939467202524156f38e0369b4f2)
@@ -0,0 +1,14 @@
+<sect2>
+<title>Introduction to qt using objprelink</title>
+
+
+<para>This section covers a very specialized compile of qt which
+dramatically decreases the load time for kde desktop programs.  It is
+also known not to work under some conditions and will produce segfaults instead of faster load times.  The details of prelinking are discussed at
+<ulink url="http://objprelink.sourceforge.net"/>.  When you feel comfortable 
+with the risks and rewards, proceed to the installation section.</para>
+
+<screen>qt using objprelink depends on: <xref linkend="xfree86"/>, <xref linkend="objprelink"/>,  <xref linkend="zlib"/>, 
+<xref linkend="libpng"/>, <xref linkend="libmng"/>, and <xref linkend="libjpeg"/></screen>
+
+</sect2>
Index: x/lib/qt5-alternate.xml
===================================================================
--- x/lib/qt5-alternate.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,663 +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 qt5-major "5.15">
-  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
-
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
-  <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "3fb1cd4f763f5d50d491508b7b99fb77">
-  <!ENTITY qt5-size          "630 MB">
-  <!ENTITY qt5-buildsize     "8.5 GB (154 MB installed)">
-  <!ENTITY qt5-time          "7.4 SBU (using parallelism=4)">
-]>
-
-<sect1 id="qt5-alternate" xreflabel="qt-alternate-&qt5-version;">
-  <?dbhtml filename="qt5-alternate.html" ?>
-
-  <title>qt-alternate-&qt5-version;</title>
-
-  <indexterm zone="qt5-alternate">
-    <primary sortas="a-Qt5-alternate">Qt Alternate</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qt5 (alternate)</title>
-
-    <para>
-      <application>Qt5</application> is a cross-platform application framework
-      that is widely used for developing application software with a graphical
-      user interface (GUI) (in which cases <application>qt5</application> is
-      classified as a widget toolkit), and also used for developing non-GUI
-      programs such as command-line tools and consoles for servers. Two of the
-      major users of <application>qt</application> are <application>KDE
-      Frameworks 5 (KF5)</application> and <application>LXQt</application>.
-    </para>
-
-    <important>
-      <para>
-         The full <application>qt5</application> package consists of 43 separate
-         components. These instructions use a small subset of the full
-         <application>qt5</application> installation instructions above.
-         They cover most, but not all, of the components needed to build
-         packages in BLFS. This page, and the next, are provided to
-         reduce the amount of time, space, and dependencies needed
-         to build these packages. <!--They are not recommended if you will build
-         the <xref linkend="kf5- frameworks"/> based <xref linkend="plasma-build"/> desktop
-         environment.-->
-      </para>
-    </important>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qt5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="cups"/>,
-      <phrase revision='sysv'><xref linkend="dbus"/>,</phrase>
-      <xref linkend="double-conversion"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="wayland"/> (<application>Mesa</application>
-      must be built with <application>Wayland</application> EGL
-      backend),
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-renderutil"/>, and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk3"/>,
-      <xref linkend="libinput"/>
-      <xref linkend="mariadb"/>
-        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="mtdev"/>
-      <xref linkend="postgresql"/>, and
-      <xref linkend="unixodbc"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="qt5-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
-
-    <para>
-      The BLFS editors recommend installing <application>qt5</application> in a
-      directory other than <filename class="directory">/usr</filename>, i.e.
-      <filename class="directory">/opt/qt5</filename>.  To do this,  set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes, the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt5</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt5-version;</filename>. To create a
-        versioned <application>qt5</application> directory after the
-        installation is complete, you may rename the directory and create a symlink:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/qt-&qt5-version;
-ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>qt5</application>. To do that, just remove the symlink
-        and use <filename class="directory">/opt/qt5</filename> as the
-        prefix again. Which version of <application>qt5</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qt5</title>
-
-    <warning>
-      <para>
-        If <application>qt5</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-qt5 based
-        window manager. It overwrites <application>qt5</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        The BLFS editors do not recommend installing
-        <application>qt5</application> into the
-        <filename class="directory">/usr</filename> hierarchy because it
-        becomes difficult to find components and to update to a new version.
-        If you do want to install <application>qt5</application> in
-        <filename class="directory">/usr</filename>, the directories need to
-        be specified explicitly.  In this case, set
-        <envar>QT5PREFIX=/usr</envar> and add the following to the configure
-        arguments below:
-      </para>
-
-<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt5                \
-            -bindir         /usr/bin                    \
-            -plugindir      /usr/lib/qt5/plugins        \
-            -importdir      /usr/lib/qt5/imports        \
-            -headerdir      /usr/include/qt5            \
-            -datadir        /usr/share/qt5              \
-            -docdir         /usr/share/doc/qt5          \
-            -translationdir /usr/share/qt5/translations \
-            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
-    </note>
-
-    <para>
-      Now apply a patch to pull in the fixes curated by kde for those
-      modules which are required by packages mentioned in this book:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen>
-
-    <para>
-      The patch is supposed to be used in a git repository. Otherwise some
-      files that should be modified by <command>configure</command> after
-      applying the patch are not touched. Fortunately, it is enough to create a
-      <filename class="directory">.git</filename> directory in the
-      <filename class="directory">qmake</filename> directory where the
-      <command>configure</command> script is run:
-    </para>
-
-    <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
-
-    <para>
-      Fix a security vulnerability in qtbase:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      At this point we want to set up skipping most components.  Do that with:
-    </para>
-
-<screen><userinput>ls -Fd qt* | grep / | sed 's/^/-skip /;s@/@@' > tempconf &amp;&amp;
-sed -i -r '/base|tools|x11extras|svg|declarative|wayland/d' tempconf</userinput></screen>
-
-    <para>
-      Now, install <application>qt5</application> by running the following
-      commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure -prefix $QT5PREFIX   \
-            -sysconfdir /etc/xdg \
-            -confirm-license     \
-            -opensource          \
-            -dbus-linked         \
-            -openssl-linked      \
-            -system-harfbuzz     \
-            -system-sqlite       \
-            -nomake examples     \
-            -no-rpath            \
-            -syslog              \
-            $(cat tempconf)      \
-            &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure -prefix $QT5PREFIX   \
-            -sysconfdir /etc/xdg \
-            -confirm-license     \
-            -opensource          \
-            -dbus-linked         \
-            -openssl-linked      \
-            -system-harfbuzz     \
-            -system-sqlite       \
-            -nomake examples     \
-            -no-rpath            \
-            -journald            \
-            $(cat tempconf)      \
-            &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>
-
-    <!-- EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
-         installing in a temporary directory. -->
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      command as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed applications.
-      The <envar>QT5BINDIR</envar> variable is used here to point to the
-      directory for the executable programs.  If you have changed the bindir
-      above, <envar>QT5BINDIR</envar> will need to be adjusted below.  Be sure
-      that the <envar>QT5BINDIR</envar> variable is defined in root's
-      environment and as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>QT5BINDIR=$QT5PREFIX/bin
-
-install -v -dm755 /usr/share/pixmaps/                  &amp;&amp;
-
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
-
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt5.png &amp;&amp;
-
-install -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Assistant
-Comment=Shows Qt5 documentation and examples
-Exec=$QT5BINDIR/assistant
-Icon=assistant-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=$QT5BINDIR/designer
-Icon=designer-qt5.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=$QT5BINDIR/linguist
-Icon=linguist-qt5.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT5BINDIR/qdbusviewer
-Icon=qdbusviewer-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-    <para>
-      Some packages such as <xref linkend='vlc'/> look for certain
-      executables with a -qt5 suffix.  Run the following command as the
-      <systemitem class="username">root</systemitem> user
-      to create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
-  ln -sfvn $QT5BINDIR/$file /usr/bin/$file-qt5
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>qt</application>.
-    </para>
-
-    <para>
-      <parameter>-nomake examples</parameter>: This switch
-      disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-system-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked</parameter>
-      <parameter>-openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>qt5</application> libraries instead of
-      <command>dlopen()</command>-ing them.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-syslog</parameter>: This switch allows to send qt messages
-      to the <command>syslog</command> logging system.
-    </para>
-
-    <para revision="systemd">
-      <parameter>-journald</parameter>: This switch allows to send qt messages
-      to the <command>journald</command> logging system.
-    </para>
-
-    <para>
-      <command>$(cat tempconf)</command>: This command provides a list of
-      components that should not be built. These entries are in the form of
-      "-skip &lt;component&gt;".
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring qt5</title>
-
-    <sect3 id="qt5-alt-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If <xref linkend="sudo"/> is installed, QT5DIR should be available to
-        the super user as well. Execute the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT5DIR</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you installed qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>qt5</application> in
-        <filename class="directory">/usr</filename>, create an
-        environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt5.sh
-
-QT5DIR=/usr
-export QT5DIR
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you did not install qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>qt5</application> in a location other
-        than <filename class="directory">/usr</filename>, you need to update the
-        following configuration files so that <application>qt5</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
-
-/opt/qt5/lib
-
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt5 qt5-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/qt5.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt_5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt_5.sh
-
-QT5DIR=/opt/qt5
-
-pathappend $QT5DIR/bin           PATH
-pathappend $QT5DIR/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT5DIR
-
-# End /etc/profile.d/qt_5.sh</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>
-          assistant, designer, fixqt4headers.pl, lconvert,
-          linguist, lprodump, lrelease, lrelease-pro, lupdate, lupdate-pro,
-          moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
-          qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc,
-          qhelpgenerator, qlalr, qmake, qml, qmlcachegen, qmleasing,
-          qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
-          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qmltime,
-          qmltyperegistrar,
-          qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
-          qtwaylandscanner, qvkgen, rcc, syncqt.pl, tracegen, and
-          uic
-        </seg>
-        <seg>
-          libQt5AccessibilitySupport.a,
-          libQt5Bootstrap.a,
-          libQt5Concurrent.so,
-          libQt5Core.so,
-          libQt5DBus.so,
-          libQt5Designer.so,
-          libQt5DesignerComponents.so,
-          libQt5DeviceDiscoverySupport.a,
-          libQt5EdidSupport.a,
-          libQt5EglFSDeviceIntegration.so,
-          libQt5EglFsKmsSupport.so,
-          libQt5EglSupport.a,
-          libQt5EventDispatcherSupport.a,
-          libQt5FbSupport.a,
-          libQt5FontDatabaseSupport.a,
-          libQt5GlxSupport.a,
-          libQt5Gui.so,
-          libQt5Help.so,
-          libQt5InputSupport.a,
-          libQt5KmsSupport.a,
-          libQt5LinuxAccessibilitySupport.a,
-          libQt5Network.so,
-          libQt5OpenGL.so,
-          libQt5OpenGLExtensions.a,
-          libQt5PacketProtocol.a,
-          libQt5PlatformCompositorSupport.a,
-          libQt5PrintSupport.so,
-          libQt5Qml.so,
-          libQt5QmlDebug.a,
-          libQt5QmlDevTools.a,
-          libQt5QmlModels.so,
-          libQt5QmlWorkerScript.so,
-          libQt5Quick.so,
-          libQt5QuickParticles.so,
-          libQt5QuickShapes.so,
-          libQt5QuickTest.so,
-          libQt5QuickWidgets.so,
-          libQt5ServiceSupport.a,
-          libQt5Sql.so,
-          libQt5Svg.so,
-          libQt5Test.so,
-          libQt5ThemeSupport.a,
-          libQt5UiTools.a,
-          libQt5WaylandClient.so,
-          libQt5WaylandCompositor.so,
-          libQt5Widgets.so,
-          libQt5X11Extras.so,
-          libQt5XcbQpa.so,
-          libQt5XkbCommonSupport.a,
-          libQt5Xml.so,
-          and several plugins under /opt/qt5/{plugins,qml}
-        </seg>
-        <seg>
-          /usr/include/qt5,
-          /usr/lib/qt5,
-          /usr/share/doc/qt5, and
-          /usr/share/qt5
-          OR
-          /opt/qt5 and
-          /opt/qt-&qt5-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-    <para>See <xref linkend="qt5-descriptions"/></para>
-
-  </sect2>
-
-</sect1>
Index: x/lib/qt5-components.xml
===================================================================
--- x/lib/qt5-components.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 qt5-major "5.15">
-  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
-
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
-  <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "3fb1cd4f763f5d50d491508b7b99fb77">
-  <!ENTITY qt5-size          "630 MB">
-  <!ENTITY qt5-buildsize     "varies">
-  <!ENTITY qt5-time          "varies">
-]>
-
-<sect1 id="qt5-components" xreflabel="qt-components-&qt5-version;">
-  <?dbhtml filename="qt5-components.html" ?>
-
-  <title>qt-components-&qt5-version;</title>
-
-  <indexterm zone="qt5-components">
-    <primary sortas="a-Qt5-components">Qt Components</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to qt5 components</title>
-
-    <para>
-      These instructions show how to build additional Qt5 components beyond
-      <xref linkend="qt5-alternate"/>.  They are not applicable if the
-      full <xref linkend="qt5"/> package has been built.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt5-size;
-        </para>
-      </listitem>
-<!--
-      <listitem>
-        <para>
-          Estimated disk space required: &qt5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt5-time;
-        </para>
-      </listitem>
--->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">qt5 components Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="qt5-alternate"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended dependencies for qtimageformats</bridgehead>
-    <para role="recommended">
-      <xref linkend="jasper"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libtiff"/>, and
-      <xref linkend="libwebp"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended dependencies for qtmultimedia</bridgehead>
-    <para role="recommended">
-      <xref linkend="gst10-plugins-good"/>,
-      <xref linkend="gst10-plugins-bad"/>, and
-      <xref linkend="gst10-plugins-ugly"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qt5 components</title>
-
-    <para>
-      There are a few extra components needed for different packages in BLFS.
-      These are
-      <emphasis role="bold">qtimageformats</emphasis>,
-      <emphasis role="bold">qtlocation</emphasis>,
-      <emphasis role="bold">qtwebchannel</emphasis>,
-      <emphasis role="bold">qtdoc</emphasis>, and
-      <emphasis role="bold">qtmultimedia</emphasis>.
-      Only those components specified for a specific
-      package are needed. You only need to build the relevant component(s).
-    </para>
-
-    <para>
-      First, apply a patch to pull in the fixes curated by KDE for some of the
-      modules listed above:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen>
-
-    <para>
-      Next, if you are installing <emphasis role="bold">qtlocation</emphasis>,
-      fix the build with GCC-13:
-    </para>
-
-<screen><userinput>sed -e "/pragma once/a#include &lt;cstdint&gt;"                                      \
-    -i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \
-       qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp   \
-       qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>
-
-    <para>
-      Install each desired component by running the following commands:
-    </para>
-
-<screen><userinput>cd <replaceable>&lt;component&gt;</replaceable>
-qmake <replaceable>&lt;component&gt;</replaceable>.pro
-make</userinput></screen>
-
-    <para>
-      As the &root; user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    <!-- EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
-         installing in a temporary directory. -->
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      command as the &root; user:
-    </para>
-
-<screen role="root"><userinput>find $QT5DIR/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</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>
-          libQt5&lt;component&gt;.so
-        </seg>
-        <seg>
-          $QT5DIR/qml/&lt;component&gt;,
-          $QT5DIR/lib/cmake/&lt;component&gt;, and
-          $QT5DIR/include/&lt;component&gt;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,1356 +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 qt5-major "5.15">
-  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
-
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
-  <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "3fb1cd4f763f5d50d491508b7b99fb77">
-  <!ENTITY qt5-size          "630 MB">
-  <!ENTITY qt5-buildsize     "15 GB (264 MB installed)">
-  <!ENTITY qt5-time          "16 SBU (using parallelism=4)">
-]>
-
-<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
-  <?dbhtml filename="qt5.html" ?>
-
-
-  <title>Qt-&qt5-version;</title>
-
-  <indexterm zone="qt5">
-    <primary sortas="a-Qt5">Qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt5</title>
-
-    <para>
-      <application>Qt5</application> is a cross-platform application framework
-      that is widely used for developing application software with a graphical
-      user interface (GUI) (in which cases <application>Qt5</application> is
-      classified as a widget toolkit), and also used for developing non-GUI
-      programs such as command-line tools and consoles for servers. Two of the
-      major users of <application>Qt</application> are <application>KDE
-      Frameworks 5 (KF5)</application> and <application>LXQt</application>.
-    </para>
-
-    <important>
-      <para>
-         The installation of the full Qt5 packages is now deprecated for BLFS
-         due to the release of <xref linkend="qt6"/>.  This page will probably
-         be removed soon depending on the release of new versions of packages
-         that still use Qt5.  For those packages, users should use 
-         <xref linkend="qt5-alternate"/>.
-      </para>
-    </important>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt5-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt5-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt5-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt5-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt5-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt5-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>Qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular Qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="at-spi2-core"/>,
-      <xref linkend="make-ca"/>,
-      <xref linkend="cups"/>,
-      <phrase revision='sysv'><xref linkend="dbus"/>,</phrase>
-      <xref linkend="double-conversion"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="mtdev"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="wayland"/> (<application>Mesa</application>
-      must be built with <application>Wayland</application> EGL
-      backend),
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-renderutil"/>, and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="bluez"/> (for sdpscanner, and at runtime for
-      QtConnectivity module),
-      <xref linkend="gtk3"/>,
-      <xref linkend="ibus"/>,
-      <xref linkend="libinput"/>,
-      <xref linkend="mariadb"/>
-        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="pciutils"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl2"/>,
-      <xref linkend="unixodbc"/>,
-      <xref linkend="vulkan-loader"/>,
-      <ulink url="https://www.assimp.org/">assimp</ulink>,
-      <ulink url="https://github.com/festvox/flite">Flite</ulink>,
-      <ulink url="https://www.firebirdsql.org/">Firebird</ulink>,
-      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
-      <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink>,
-      <ulink url="https://freebsoft.org/speechd/">speech-dispatcher</ulink>, and
-      <ulink url="http://www.tslib.org/">tslib</ulink>
-    </para>
-
-    <!-- Many of the dependencies in the qmake/configure output do not apply
-         to Linux-based platforms. I've selected the ones that do and put
-         them in as optional dependencies. -renodr -->
-  </sect2>
-
-  <sect2 role="qt5-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt5</bridgehead>
-
-    <para>
-      The BLFS editors recommend installing <application>Qt5</application> in a
-      directory other than <filename class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt5</filename>.  To do this, set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT5PREFIX=/opt/qt5</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt5</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt5-version;</filename>. To create a
-        versioned <application>Qt5</application> directory, 
-        you may create a versioned directory and a symlink:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/qt-&qt5-version;
-ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>Qt5</application>. To do that, just remove the symlink,
-        create the new versioned directory, and recreate the 
-        <filename class="directory">/opt/qt5</filename> symlink again before
-        building the new version.
-        Which version of <application>Qt5</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-    <note>
-      <para>
-        If <xref linkend="qca"/> has been installed and you are
-        reinstalling or updating this package, then
-        <application>qca</application> will need to be reinstalled.
-      </para>
-    </note>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt5</title>
-
-    <warning>
-      <para>
-        If <application>Qt5</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        <systemitem class="username">root</systemitem>, such as
-        <command>make install</command>, from a console or non-Qt5 based
-        window manager. It overwrites <application>Qt5</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        The build time and space required for the full
-        <application>Qt5</application> is quite long. The instructions below
-        do not build the tutorials and examples. Removing the
-        <parameter>-nomake</parameter> line will create a complete build.
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The BLFS editors do not recommend installing
-        <application>Qt5</application> into the
-        <filename class="directory">/usr</filename> hierarchy because it
-        becomes difficult to find components and to update to a new version.
-        If you do want to install <application>Qt5</application> in
-        <filename class="directory">/usr</filename>, the directories need to
-        be specified explicitly.  In this case, set
-        <envar>QT5PREFIX=/usr</envar> and add the following to the configure
-        arguments below:
-      </para>
-
-<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt5                \
-            -bindir         /usr/bin                    \
-            -plugindir      /usr/lib/qt5/plugins        \
-            -importdir      /usr/lib/qt5/imports        \
-            -headerdir      /usr/include/qt5            \
-            -datadir        /usr/share/qt5              \
-            -docdir         /usr/share/doc/qt5          \
-            -translationdir /usr/share/qt5/translations \
-            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
-    </note>
-
-    <para>
-      Now apply a patch to pull in the fixes curated by kde for those
-      modules which are required by packages mentioned in this book:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen>
-
-    <para>
-      The patch is supposed to be used in a git repository. Otherwise some
-      files that should be modified by <command>configure</command> after
-      applying the patch are not touched. Fortunately, it is enough to create a
-      <filename class="directory">.git</filename> directory in the
-      <filename class="directory">qmake</filename> directory where the
-      <command>configure</command> script is run:
-    </para>
-
-    <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
-
-    <para>
-      Add another fix for building with GCC-13:
-    </para>
-
-<screen><userinput>sed -e "/pragma once/a#include &lt;cstdint&gt;"                                      \
-    -i qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp \
-       qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp   \
-       qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp</userinput></screen>
-
-    <para>
-      Fix a security vulnerability in qtbase:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt5-version;-security_fix-1.patch</userinput></screen>
-
-    <para>
-      Install <application>Qt5</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure -prefix $QT5PREFIX                        \
-            -sysconfdir /etc/xdg                      \
-            -confirm-license                          \
-            -opensource                               \
-            -dbus-linked                              \
-            -openssl-linked                           \
-            -system-harfbuzz                          \
-            -system-sqlite                            \
-            -nomake examples                          \
-            -no-rpath                                 \
-            -syslog                                   \
-            -skip qtwebengine                         &amp;&amp;
-make</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure -prefix $QT5PREFIX                        \
-            -sysconfdir /etc/xdg                      \
-            -confirm-license                          \
-            -opensource                               \
-            -dbus-linked                              \
-            -openssl-linked                           \
-            -system-harfbuzz                          \
-            -system-sqlite                            \
-            -nomake examples                          \
-            -no-rpath                                 \
-            -journald                                 \
-            -skip qtwebengine                         &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>
-
-    <!-- EDITORS NOTE: This package uses INSTALL_ROOT= instead of DESTDIR= for
-         installing in a temporary directory. -->
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) files by running the following
-      command as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed applications.
-      The <envar>QT5BINDIR</envar> variable is used here to point to the
-      directory for the executable programs.  If you have changed the bindir
-      above, <envar>QT5BINDIR</envar> will need to be adjusted below.  Be sure
-      that the <envar>QT5BINDIR</envar> variable is defined in root's
-      environment and as the <systemitem class="username">root</systemitem>
-      user:
-    </para>
-
-<screen role="root"><userinput>QT5BINDIR=$QT5PREFIX/bin
-
-install -v -dm755 /usr/share/pixmaps/                  &amp;&amp;
-
-install -v -Dm644 qttools/src/assistant/assistant/images/assistant-128.png \
-                  /usr/share/pixmaps/assistant-qt5.png &amp;&amp;
-
-install -v -Dm644 qttools/src/designer/src/designer/images/designer.png \
-                  /usr/share/pixmaps/designer-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt5.png  &amp;&amp;
-
-install -v -Dm644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png \
-                  /usr/share/pixmaps/qdbusviewer-qt5.png &amp;&amp;
-
-install -dm755 /usr/share/applications &amp;&amp;
-
-cat &gt; /usr/share/applications/assistant-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Assistant
-Comment=Shows Qt5 documentation and examples
-Exec=$QT5BINDIR/assistant
-Icon=assistant-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt5 applications
-Exec=$QT5BINDIR/designer
-Icon=designer-qt5.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 Linguist
-Comment=Add translations to Qt5 applications
-Exec=$QT5BINDIR/linguist
-Icon=linguist-qt5.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt5.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt5 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT5BINDIR/qdbusviewer
-Icon=qdbusviewer-qt5.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-    <para>
-      Some packages such as <xref linkend='vlc'/> look for certain
-      executables with a -qt5 suffix.  Run the following command as the
-      <systemitem class="username">root</systemitem> user
-      to create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
-  ln -sfvn $QT5BINDIR/$file /usr/bin/$file-qt5
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>Qt</application>.
-    </para>
-
-    <para>
-      <parameter>-nomake examples</parameter>: This switch
-      disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked</parameter>
-      <parameter>-openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>Qt5</application> libraries instead of
-      <command>dlopen()</command>-ing them.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-syslog</parameter>: This switch allows to send Qt messages
-      to the <command>syslog</command> logging system.
-    </para>
-
-    <para revision="systemd">
-      <parameter>-journald</parameter>: This switch allows to send Qt messages
-      to the <command>journald</command> logging system.
-    </para>
-
-    <para>
-      <parameter>-skip qtwebengine</parameter>: This switch disables building
-      the QtWebEngine. The BLFS editors have chosen to build <xref
-      linkend="qtwebengine"/> separately.
-    </para>
-
-    <para>
-      <parameter>-system-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt5</title>
-
-    <sect3 id="qt5-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If <xref linkend="sudo"/> is installed, QT5DIR should be available to
-        the super user as well. Execute the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT5DIR</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you installed Qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>Qt5</application> in
-        <filename class="directory">/usr</filename>, create an
-        environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt5.sh
-
-QT5DIR=/usr
-export QT5DIR
-
-# End /etc/profile.d/qt5.sh</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you did not install Qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>Qt5</application> in a location other
-        than <filename class="directory">/usr</filename>, you need to update the
-        following configuration files so that <application>Qt5</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
-
-/opt/qt5/lib
-
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt5 qt5-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/qt5.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt5.sh
-
-QT5DIR=/opt/qt5
-
-pathappend $QT5DIR/bin           PATH
-pathappend $QT5DIR/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT5DIR
-
-# End /etc/profile.d/qt5.sh</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>
-          assistant, balsam, canbusutil, designer, fixqt4headers.pl, lconvert,
-          linguist, lprodump, lrelease, lrelease-pro, lupdate, lupdate-pro,
-          meshdebug, moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
-          qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc, qgltf,
-          qhelpgenerator, qlalr, qmake, qml, qmlcachegen, qmleasing,
-          qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
-          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qmltime,
-          qmltyperegistrar, qscxmlc,
-          qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
-          qtwaylandscanner, qvkgen, rcc, repc, sdpscanner, syncqt.pl, tracegen,
-          uic, xmlpatterns, and xmlpatternsvalidator
-        </seg>
-        <seg>
-          libQt53DAnimation.so, libQt53DCore.so,
-          libQt53DExtras.so, libQt53DInput.so, libQt53DLogic.so,
-          libQt53DQuick.so, libQt53DQuickAnimation.so, libQt53DQuickExtras.so,
-          libQt53DQuickInput.so, libQt53DQuickRender.so,
-          libQt53DQuickScene2D.so, libQt53DRender.so,
-          libQt5AccessibilitySupport.a, libQt5Bluetooth.so, libQt5Bodymovin.so,
-          libQt5Bootstrap.a, libQt5Charts.so, libQt5Concurrent.so,
-          libQt5Core.so, libQt5DataVisualization.so, libQt5DBus.so,
-          libQt5DesignerComponents.so, libQt5Designer.so,
-          libQt5DeviceDiscoverySupport.a, libQt5EdidSupport.a,
-          libQt5EglFSDeviceIntegration.so, libQt5EglFsKmsSupport.so,
-          libQt5EglSupport.a, libQt5EventDispatcherSupport.a, libQt5FbSupport.a,
-          libQt5FontDatabaseSupport.a, libQt5Gamepad.so, libQt5GlxSupport.a,
-          libQt5Gui.so,libQt5Help.so, libQt5InputSupport.a, libQt5KmsSupport.a,
-          libQt5LinuxAccessibilitySupport.a, libQt5Location.so,
-          libQt5Multimedia.so, libQt5MultimediaGstTools.so,
-          libQt5MultimediaQuick.so, libQt5MultimediaWidgets.so,
-          libQt5Network.so, libQt5NetworkAuth.so, libQt5Nfc.so,
-          libQt5OpenGLExtensions.a, libQt5OpenGL.so, libQt5PacketProtocol.a,
-          libQt5PlatformCompositorSupport.a, libQt5Positioning.so,
-          libQt5PositioningQuick.so, libQt5PrintSupport.so,
-          libQt5Purchasing.so, libQt5Qml.so, libQt5QmlDebug.a,
-          libQt5QmlDevTools.a, libQt5QmlModels.so, libQt5QmlWorkerScript.so,
-          libQt5Quick.so, libQt5Quick3D.so, libQt5Quick3DAssetImport.so,
-          libQt5Quick3DRender.so, libQt5Quick3DRuntimeRender.so,
-          libQt5Quick3DUtils.so, libQt5QuickControls2.so,
-          libQt5QuickParticles.so, libQt5QuickShapes.so,
-          libQt5QuickTemplates2.so, libQt5QuickTest.so, libQt5QuickWidgets.so,
-          libQt5RemoteObjects.so, libQt5Script.so, libQt5ScriptTools.so,
-          libQt5Scxml.so, libQt5Sensors.so, libQt5SerialBus.so,
-          libQt5SerialPort.so, libQt5ServiceSupport.a, libQt5Sql.so,
-          libQt5Svg.so, libQt5Test.so, libQt5TextToSpeech.so,
-          libQt5ThemeSupport.a, libQt5UiTools.a, libQt5VirtualKeyboard.so,
-          libQt5VulkanSupport.a, libQt5WaylandClient.so,
-          libQt5WaylandCompositor.so, libQt5WebChannel.so, libQt5WebSockets.so,
-          libQt5WebView.so, libQt5Widgets.so, libQt5X11Extras.so,
-          libQt5XcbQpa.so, libQt5XkbCommonSupport.a, libQt5Xml.so,
-          libQt5XmlPatterns.so,
-          and several plugins under /opt/qt5/{plugins,qml}
-        </seg>
-        <seg>
-          /usr/include/qt5,
-          /usr/lib/qt5,
-          /usr/share/doc/qt5, and
-          /usr/share/qt5
-          OR
-          /opt/qt5 and
-          /opt/qt-&qt5-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist id='qt5-descriptions' xreflabel="Qt5 Short Descriptions">
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt5">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation
-          </para>
-          <indexterm zone="qt5 assistant-qt5">
-            <primary sortas="b-assistant-qt5">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="balsam">
-        <term><command>balsam</command></term>
-        <listitem>
-          <para>
-            is a tool to convert 3D scenes from various creation tools
-            to QML format, for use by the new QtQuick 3D library
-          </para>
-          <indexterm zone="qt5 balsam">
-            <primary sortas="b-balsam">balsam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="canbusutil">
-        <term><command>canbustil</command></term>
-        <listitem>
-          <para>
-            is a tool to deal with arbitrary CAN bus frames.
-            A Controller Area Network (CAN) is a vehicle bus standard designed
-            to allow microcontrollers and devices to communicate with each other
-            in applications without a host computer
-          </para>
-          <indexterm zone="qt5 canbusutil">
-            <primary sortas="b-canbusutil">canbusutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt5">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>
-            is a full-fledged GUI builder. It includes
-            powerful features such as preview mode, automatic widget
-            layout, support for custom widgets, and an advanced
-            property editor
-          </para>
-          <indexterm zone="qt5 designer-qt5">
-            <primary sortas="b-designer-qt5">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="fixqt4headers.pl">
-        <term><command>fixqt4headers.pl</command></term>
-        <listitem>
-          <para>
-            is a script to replace all Qt 4 style includes with Qt 5 includes
-          </para>
-          <indexterm zone="qt5 fixqt4headers.pl">
-            <primary sortas="b-fixqt4headers.pl">fixqt4headers.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lconvert-qt5">
-        <term><command>lconvert</command></term>
-        <listitem>
-          <para>
-            is part of Qt5's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files
-          </para>
-          <indexterm zone="qt5 lconvert-qt5">
-            <primary sortas="b-lconvert-qt5">lconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt5">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages
-          </para>
-          <indexterm zone="qt5 linguist-qt5">
-            <primary sortas="b-linguist-qt5">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt5">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads XML-based translation
-            file in TS format and produces message files used by the
-            application
-          </para>
-          <indexterm zone="qt5 lrelease-qt5">
-            <primary sortas="b-lrelease-qt5">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-pro">
-        <term><command>lrelease-pro</command></term>
-        <listitem>
-          <para>
-            extracts project information from qmake projects and passes
-            it to lrelease
-          </para>
-          <indexterm zone="qt5 lrelease-pro">
-            <primary sortas="b-lrelease-pro">lrelease-pro</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt5">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and stores the extracted messages in
-            translation files to be processed by lrelease
-          </para>
-          <indexterm zone="qt5 lupdate-qt5">
-            <primary sortas="b-lupdate-qt5">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-pro">
-        <term><command>lupdate-pro</command></term>
-        <listitem>
-          <para>
-            reads a Qt project file, an passes the collected information
-            to lupdate
-          </para>
-          <indexterm zone="qt5 lupdate-pro">
-            <primary sortas="b-lupdate-pro">lupdate-pro</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="meshdebug">
-        <term><command>meshdebug</command></term>
-        <listitem>
-          <para>
-            displays information about qtquick-3d mesh files
-          </para>
-          <indexterm zone="qt5 meshdebug">
-            <primary sortas="b-meshdebug">meshdebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="moc-qt5">
-        <term><command>moc</command></term>
-        <listitem>
-          <para>
-            generates Qt meta object support code
-          </para>
-          <indexterm zone="qt5 moc-qt5">
-            <primary sortas="b-moc-qt5">moc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt5">
-        <term><command>pixeltool</command></term>
-        <listitem>
-          <para>
-            is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window
-          </para>
-          <indexterm zone="qt5 pixeltool-qt5">
-            <primary sortas="b-pixeltool-qt5">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qcollectiongenerator-qt5">
-        <term><command>qcollectiongenerator</command></term>
-        <listitem>
-          <para>
-            processes and converts Qt help files
-          </para>
-          <indexterm zone="qt5 qcollectiongenerator-qt5">
-            <primary sortas="b-qcollectiongenerator-qt5">qcollectiongenerator-qt5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbuscpp2xml-qt5">
-        <term><command>qdbuscpp2xml</command></term>
-        <listitem>
-          <para>
-            takes a C++ source file and generates a D-Bus XML definition
-            of the interface
-          </para>
-          <indexterm zone="qt5 qdbuscpp2xml-qt5">
-            <primary sortas="b-qdbuscpp2xml-qt5">qdbuscpp2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbus-qt5">
-        <term><command>qdbus</command></term>
-        <listitem>
-          <para>
-            lists available services, object paths,  methods, signals, and
-            properties of objects on a bus
-          </para>
-          <indexterm zone="qt5 qdbus-qt5">
-            <primary sortas="b-qdbus-qt5">qdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusviewer-qt5">
-        <term><command>qdbusviewer</command></term>
-        <listitem>
-          <para>
-            is a graphical D-Bus browser
-          </para>
-          <indexterm zone="qt5 qdbusviewer-qt5">
-            <primary sortas="b-qdbusviewer-qt5">qdbusviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusxml2cpp-qt5">
-        <term><command>qdbusxml2cpp</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to parse interface descriptions
-            and produce static code representing those interfaces,
-          </para>
-          <indexterm zone="qt5 qdbusxml2cpp-qt5">
-            <primary sortas="b-qdbusxml2cpp-qt5">qdbusxml2cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdistancefieldgenerator-qt5">
-        <term><command>qdistancefieldgenerator</command></term>
-        <listitem>
-          <para>
-            allows a font cache to be pregenerated for Text.QtRendering to speed
-            up an application's startup if the user interface has a lot of text,
-            or multiple fonts, or a large amount of distinct characters, e.g. in
-            CJK writing systems
-          </para>
-          <indexterm zone="qt5 qdistancefieldgenerator-qt5">
-            <primary sortas="b-qdistancefieldgenerator-qt5">qdistancefieldgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdoc-qt5">
-        <term><command>qdoc</command></term>
-        <listitem>
-          <para>
-            is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects
-          </para>
-          <indexterm zone="qt5 qdoc-qt5">
-            <primary sortas="b-qdoc-qt5">qdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qgltf">
-        <term><command>qgltf</command></term>
-        <listitem>
-          <para>
-            imports a variety of 3D model formats and exports into fast-to-load,
-            optimized glTF assets embedded into Qt resource files
-          </para>
-          <indexterm zone="qt5 qgltf">
-            <primary sortas="b-qgltf">qgltf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qhelpgenerator-qt5">
-        <term><command>qhelpgenerator</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate a <application>Qt</application>
-            compressed help file
-          </para>
-          <indexterm zone="qt5 qhelpgenerator-qt5">
-            <primary sortas="b-qhelpgenerator-qt5">qhelpgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qlalr-qt5">
-        <term><command>qlalr</command></term>
-        <listitem>
-          <para>
-            is a tool used to generate code from grammar specifications
-          </para>
-          <indexterm zone="qt5 qlalr-qt5">
-            <primary sortas="b-qlalr-qt5">qlalr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt5">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>
-            uses information stored in project files to
-            determine what should go in the makefiles it
-            generates
-          </para>
-          <indexterm zone="qt5 qmake-qt5">
-            <primary sortas="b-qmake-qt5">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qml">
-        <term><command>qml</command></term>
-        <listitem>
-          <para>
-            executes a QML file
-          </para>
-          <indexterm zone="qt5 qml">
-            <primary sortas="b-qml">qml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlcachegen">
-        <term><command>qmlcachegen</command></term>
-        <listitem>
-          <para>
-            supports the creation of cache files at build time
-          </para>
-          <indexterm zone="qt5 qmlcachegen">
-            <primary sortas="b-qmlcachegen">qmlcachegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmleasing-qt5">
-        <term><command>qmleasing</command></term>
-        <listitem>
-          <para>
-            is a tool used to define the easing curves using an
-            interactive curve editor
-          </para>
-          <indexterm zone="qt5 qmleasing-qt5">
-            <primary sortas="b-qmleasing-qt5">qmleasing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlformat-qt5">
-        <term><command>qmlformat</command></term>
-        <listitem>
-          <para>
-            formats QML files according to the QML coding conventions
-          </para>
-          <indexterm zone="qt5 qmlformat-qt5">
-            <primary sortas="b-qmlformat-qt5">qmlformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlimportscanner-qt5">
-        <term><command>qmlimportscanner</command></term>
-        <listitem>
-          <para>
-            is a tool used to import QML files from a directory
-          </para>
-          <indexterm zone="qt5 qmlimportscanner-qt5">
-            <primary sortas="b-qmlimportscanner-qt5">qmlimportscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmllint-qt5">
-        <term><command>qmllint</command></term>
-        <listitem>
-          <para>
-            is a syntax checker for QML files
-          </para>
-          <indexterm zone="qt5 qmllint-qt5">
-            <primary sortas="b-qmllint-qt5">qmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlmin-qt5">
-        <term><command>qmlmin</command></term>
-        <listitem>
-          <para>
-            removes comments and layout characters from a QML file
-          </para>
-          <indexterm zone="qt5 qmlmin-qt5">
-            <primary sortas="b-qmlmin-qt5">qmlmin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlplugindump-qt5">
-        <term><command>qmlplugindump</command></term>
-        <listitem>
-          <para>
-            is a tool to create a qmltypes file
-          </para>
-          <indexterm zone="qt5 qmlplugindump-qt5">
-            <primary sortas="b-qmlplugindump-qt5">qmlplugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlpreview-qt5">
-        <term><command>qmlpreview</command></term>
-        <listitem>
-          <para>
-            is a tool used to analyze QML applications
-          </para>
-          <indexterm zone="qt5 qmlpreview-qt5">
-            <primary sortas="b-qmlpreviewr-qt5">qmlpreview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlprofiler-qt5">
-        <term><command>qmlprofiler</command></term>
-        <listitem>
-          <para>
-            is a tool which watches QML and JavaScript files on disk and
-            updates the application live with any changes
-          </para>
-          <indexterm zone="qt5 qmlprofiler-qt5">
-            <primary sortas="b-qmlprofiler-qt5">qmlprofiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlscene-qt5">
-        <term><command>qmlscene</command></term>
-        <listitem>
-          <para>
-            is a utility that loads and displays QML documents even before
-            the application is complete
-          </para>
-          <indexterm zone="qt5 qmlscene-qt5">
-            <primary sortas="b-qmlscene-qt5">qmlscene</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmltestrunner-qt5">
-        <term><command>qmltestrunner</command></term>
-        <listitem>
-          <para>
-            is a tool used to make tests
-          </para>
-          <indexterm zone="qt5 qmltestrunner-qt5">
-            <primary sortas="b-qmltestrunner-qt5">qmltestrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qscxmlc-qt5">
-        <term><command>qscxml</command></term>
-        <listitem>
-          <para>
-            converts an input.scxml file to a header and cpp file
-          </para>
-          <indexterm zone="qt5 qscxmlc-qt5">
-            <primary sortas="b-qscxmlc-qt5">qscxmlc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtattributionsscanner-qt5">
-        <term><command>qtattributionsscanner</command></term>
-        <listitem>
-          <para>
-            processes qt_attribution.json files in Qt sources
-          </para>
-          <indexterm zone="qt5 qtattributionsscanner-qt5">
-            <primary sortas="b-qtattributionsscanner-qt5">qtattributionsscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdiag-qt5">
-        <term><command>qtdiag</command></term>
-        <listitem>
-          <para>
-            is a tool for reporting diagnostic information about Qt and its
-            environment
-          </para>
-          <indexterm zone="qt5 qtdiag-qt5">
-            <primary sortas="b-qtdiag-qt5">qtdiag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtpaths-qt5">
-        <term><command>qtpaths</command></term>
-        <listitem>
-          <para>
-            is a tool to query Qt path information
-          </para>
-          <indexterm zone="qt5 qtpaths-qt5">
-            <primary sortas="b-qtpaths-qt5">qtpaths</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtplugininfo">
-        <term><command>qtplugininfo</command></term>
-        <listitem>
-          <para>
-            dumps meta-data about Qt plugins in JSON format
-          </para>
-          <indexterm zone="qt5 qtplugininfo">
-            <primary sortas="b-qtplugininfo">qtplugininfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtwaylandscanner">
-        <term><command>qtwaylandscanner</command></term>
-        <listitem>
-          <para>
-            converts Wayland specfiles to C++ headers and code needed for
-            QtWayland
-          </para>
-          <indexterm zone="qt5 qtwaylandscanner">
-            <primary sortas="b-qtwaylandscanner">qtwaylandscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qvkgen">
-        <term><command>qvkgen</command></term>
-        <listitem>
-          <para>
-            converts Vulkan specfiles to C++ headers and code
-          </para>
-          <indexterm zone="qt5 qvkgen">
-            <primary sortas="b-qvkgen">qvkgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcc-qt5">
-        <term><command>rcc</command></term>
-        <listitem>
-          <para>
-            is a resource compiler used in conjunction with designer
-          </para>
-          <indexterm zone="qt5 rcc-qt5">
-            <primary sortas="b-rcc-qt5">rcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="repc">
-        <term><command>repc</command></term>
-        <listitem>
-          <para>
-            is the Replica Compiler, which generates QObject header files based
-            on an API definition file
-          </para>
-          <indexterm zone="qt5 repc">
-            <primary sortas="b-repc">repc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="sdpscanner-qt5">
-        <term><command>sdpscanner</command></term>
-        <listitem>
-          <para>
-            performs a Session Description Protocol scan on a remote device,
-            using the SDP server represented by the local Bluetooth device
-          </para>
-          <indexterm zone="qt5 sdpscanner-qt5">
-            <primary sortas="b-sdpscanner-qt5">sdpscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="syncqt.pl-qt5">
-        <term><command>syncqt.pl</command></term>
-        <listitem>
-          <para>
-            is a script to create the forwarding headers in the include
-            directories. It is an internal development tool
-          </para>
-          <indexterm zone="qt5 syncqt.pl-qt5">
-            <primary sortas="b-syncqt.pl-qt5">syncqt.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tracegen">
-        <term><command>tracegen</command></term>
-        <listitem>
-          <para>
-            is a trace generator for LTTng or ETW
-          </para>
-          <indexterm zone="qt5 tracegen">
-            <primary sortas="b-tracegen">tracegen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uic-qt5">
-        <term><command>uic</command></term>
-        <listitem>
-          <para>
-            is a Qt user interface compiler
-          </para>
-          <indexterm zone="qt5 uic-qt5">
-            <primary sortas="b-uic-qt5">uic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xmlpatterns-qt5">
-        <term><command>xmlpatterns</command></term>
-        <listitem>
-          <para>
-            provides support for XPath, XQuery, XSLT, and XML Schema
-            validation
-          </para>
-          <indexterm zone="qt5 xmlpatterns-qt5">
-            <primary sortas="b-xmlpatterns-qt5">xmlpatterns</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="xmlpatternsvalidator-qt5">
-        <term><command>xmlpatternsvalidator</command></term>
-        <listitem>
-          <para>
-            is a tool used to validate XML documents
-          </para>
-          <indexterm zone="qt5 xmlpatternsvalidator-qt5">
-            <primary sortas="b-xmlpatternsvalidator-qt5">xmlpatternsvalidator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/qt6.xml
===================================================================
--- x/lib/qt6.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,1180 +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 qt6-major "6.7">
-  <!ENTITY qt6-url   "https://download.qt.io/archive/qt/&qt6-major;/&qt6-version;/single">
-
-  <!ENTITY qt6-download-http "&qt6-url;/qt-everywhere-src-&qt6-version;.tar.xz">
-  <!ENTITY qt6-download-ftp  " ">
-  <!ENTITY qt6-md5sum        "4468b457adb3a96294947e601fc877ca">
-  <!ENTITY qt6-size          "891 MB">
-  <!ENTITY qt6-buildsize     "35 GB (358 MB installed)">
-  <!ENTITY qt6-time          "17 SBU (using parallelism=8)">
-]>
-
-<sect1 id="qt6" xreflabel="Qt-&qt6-version;">
-  <?dbhtml filename="qt6.html" ?>
-
-
-  <title>Qt-&qt6-version;</title>
-
-  <indexterm zone="qt6">
-    <primary sortas="a-Qt6">Qt6</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Qt6</title>
-
-    <para>
-      <application>Qt6</application> is a cross-platform application framework
-      that is widely used for developing application software with a graphical
-      user interface (GUI) (in which cases <application>Qt6</application> is
-      classified as a widget toolkit), and also used for developing non-GUI
-      programs such as command-line tools and consoles for servers. <!--Two of the
-      major users of <application>Qt</application> are <application>KDE
-      Frameworks 5 (KF5)</application> and <application>LXQt</application>.-->
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qt6-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qt6-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qt6-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qt6-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qt6-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qt6-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Now that <application>Qt5</application> updates are restricted to
-          commercial customers, upstream patches for the various modules are
-          being curated at kde.
-          Patches for the modules required by packages in BLFS have been
-          aggregated for the non-modular Qt5 build we use.
-        </para>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt6-version;-kf5-1.patch"/>
-        </para>
-        <para>
-          Details of the kde curation can be found at
-          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
-          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">Qt6 Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="alsa-lib"/>,
-      <xref linkend="make-ca"/>,
-      <xref linkend="cups"/>,
-      <phrase revision='sysv'><xref linkend="dbus"/>,</phrase>
-      <xref linkend="double-conversion"/>,
-      <xref linkend="glib2"/>,
-      <xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="jasper"/>,
-      <xref linkend="libjpeg"/>,
-      <xref linkend="libinput"/>,
-      <xref linkend="libmng"/>,
-      <xref linkend="libpng"/>,
-      <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxkbcommon"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="mtdev"/>,
-      <xref linkend="pcre2"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="wayland"/> (<application>Mesa</application>
-      must be built with <application>Wayland</application> EGL
-      backend),
-      <xref linkend="xcb-util-cursor"/>,
-      <xref linkend="xcb-util-image"/>,
-      <xref linkend="xcb-util-keysyms"/>,
-      <xref linkend="xcb-util-renderutil"/>, and
-      <xref linkend="xcb-util-wm"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref role="runtime" linkend="bluez"/> (for sdpscanner, and at runtime for
-      QtConnectivity module),
-      <xref linkend="gtk3"/>,
-      <xref linkend="ibus"/>,
-      <xref linkend="mariadb"/>
-        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="pciutils"/>,
-      <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>,
-      <xref linkend="sdl2"/>,
-      <xref linkend="unixodbc"/>,
-      <ulink url="https://www.assimp.org/">assimp</ulink>,
-      <ulink url="https://github.com/festvox/flite">Flite</ulink>,
-      <ulink url="https://www.firebirdsql.org/">Firebird</ulink>,
-      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
-      <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>,
-      <ulink url="https://openal.org/">OpenAL</ulink>,
-      <ulink url="https://freebsoft.org/speechd/">speech-dispatcher</ulink>, and
-      <ulink url="http://www.tslib.org/">tslib</ulink>
-      <!--<ulink url="https://vulkan.lunarg.com/sdk/home/">Vulkan</ulink>-->
-    </para>
-
-    <!-- Many of the dependencies in the qmake/configure output do not apply
-         to Linux-based platforms. I've selected the ones that do and put
-         them in as optional dependencies. Not checked yet for Qt6 -->
-
-  </sect2>
-
-  <sect2 role="qt6-prefix">
-    <title>Setting the installation prefix</title>
-
-    <bridgehead renderas="sect3">Installing in /opt/qt6</bridgehead>
-
-    <para>
-      The BLFS editors recommend installing <application>Qt6</application> in a
-      directory other than <filename class="directory">/usr</filename>, ie
-      <filename class="directory">/opt/qt6</filename>.  This is needed
-      to avoid conflicts with Qt5. To do this, set the
-      following environment variable:
-    </para>
-
-<screen><userinput>export QT6PREFIX=/opt/qt6</userinput></screen>
-
-    <tip>
-      <para>
-        Sometimes the installation paths are hardcoded into installed files.
-        This is the reason why <filename class="directory">/opt/qt6</filename>
-        is used as installation prefix instead of <filename
-        class="directory">/opt/qt-&qt6-version;</filename>. To create a
-        versioned <application>Qt6</application> directory,
-        you may rename the directory and create a symlink:
-      </para>
-
-<screen role="root"><userinput>mkdir -pv /opt/qt-&qt6-version;
-ln -sfnv qt-&qt6-version; /opt/qt6</userinput></screen>
-
-      <para>
-        Later on, you may want to install other versions of
-        <application>Qt6</application>. To do that, just remove the symlink,
-        create the new versioned directory, and recreate the
-        <filename class="directory">/opt/qt6</filename> symlink again before
-        building the new version.
-        Which version of <application>Qt6</application> you
-        use depends only on where the symlink points.
-      </para>
-    </tip>
-
-<!-- Not sure about this for Qt6
-    <note>
-      <para>
-        If <xref linkend="qca"/> has been installed and you are
-        reinstalling or updating this package, then
-        <application>qca</application> will need to be reinstalled.
-      </para>
-    </note>
--->
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Qt6</title>
-
-    <warning>
-      <para>
-        If <application>Qt6</application> is being reinstalled into the
-        same directory as an existing instance, run the commands done by
-        &root;, such as
-        <command>make install</command>, from a console or non-Qt6 based
-        window manager. It overwrites <application>Qt6</application>
-        libraries that should not be in use during the install process.
-      </para>
-    </warning>
-
-    <caution>
-      <para>
-        If you did not install some of the recommended dependencies, examine
-        <command>./configure --help</command> output to check how to disable
-        them or use internal versions bundled in the source tarball.
-      </para>
-    </caution>
-
-    <note>
-      <para>
-        The build time and space required for the full
-        <application>Qt6</application> is quite long. The instructions below
-        do not build the tutorials and examples. Removing the
-        <parameter>-nomake</parameter> line will create additional resources..
-      </para>
-    </note>
-
-    <note>
-      <para>
-        The BLFS editors do not recommend installing <application>Qt6</application>
-        into the /usr hierarchy because it becomes difficult to find
-        components and to update to a new version.  There are also some programs
-        that conflict with those installed by Qt5.
-        <!--If you do want to install
-        <application>Qt5</application> in /usr, the directories need to
-        be specified explicitly.  In this case, set QT5PREFIX=/usr and add
-        the following to the configure arguments below:
-      </para>
-
-<screen role="nodump"><userinput>            -archdatadir    /usr/lib/qt6                \
-            -bindir         /usr/bin                    \
-            -plugindir      /usr/lib/qt6/plugins        \
-            -importdir      /usr/lib/qt6/imports        \
-            -headerdir      /usr/include/qt6            \
-            -datadir        /usr/share/qt6              \
-            -docdir         /usr/share/doc/qt6          \
-            -translationdir /usr/share/qt6/translations \
-            -examplesdir    /usr/share/doc/qt6/examples</userinput></screen>-->
-      </para>
-    </note>
-
-    <para>
-      First make a correction identified upstream:
-    </para>
-
-<screen><userinput>sed -i '/if __cpp_lib_span/s/if/ifdef/' qtbase/src/corelib/tools/qspan.h</userinput></screen>
-
-    <para>
-      Install <application>Qt6</application> by running the following commands:
-    </para>
-
-<screen revision="sysv"><userinput>./configure -prefix $QT6PREFIX      \
-            -sysconfdir /etc/xdg    \
-            -dbus-linked            \
-            -openssl-linked         \
-            -system-sqlite          \
-            -nomake examples        \
-            -no-rpath               \
-            -syslog                 \
-            -skip qt3d              \
-            -skip qtquick3dphysics  \
-            -skip qtwebengine       \
-            -Wno-dev                &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="systemd"><userinput>./configure -prefix $QT6PREFIX      \
-            -sysconfdir /etc/xdg    \
-            -dbus-linked            \
-            -openssl-linked         \
-            -system-sqlite          \
-            -nomake examples        \
-            -no-rpath               \
-            -journald               \
-            -skip qt3d              \
-            -skip qtquick3dphysics  \
-            -skip qtwebengine       \
-            -Wno-dev                &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>
-
-    <para>
-      Remove references to the build directory from installed library
-      dependency (prl) <!--and profile include (pri)--> files by running the following
-      command as the &root; user:
-    </para>
-
-<screen role="root"><userinput>find $QT6PREFIX/ -name \*.prl \
-   -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
-
-    <para>
-      Install images and create the menu entries for installed applications.
-      <!--The <envar>QT6BINDIR</envar> variable is used here to point to the
-      directory for the executable programs.  If you have changed the bindir
-      above, <envar>QT5BINDIR</envar> will need to be adjusted below.  Be sure
-      that the <envar>QT5BINDIR</envar> variable is defined in root's
-      environment and as the &root; user:-->
-      Again as the &root; user:
-    </para>
-
-<screen role="root"><userinput>pushd qttools/src &amp;&amp;
-
-install -v -Dm644 assistant/assistant/images/assistant-128.png       \
-                  /usr/share/pixmaps/assistant-qt6.png               &amp;&amp;
-
-install -v -Dm644 designer/src/designer/images/designer.png          \
-                  /usr/share/pixmaps/designer-qt6.png                &amp;&amp;
-
-install -v -Dm644 linguist/linguist/images/icons/linguist-128-32.png \
-                  /usr/share/pixmaps/linguist-qt6.png                &amp;&amp;
-
-install -v -Dm644 qdbus/qdbusviewer/images/qdbusviewer-128.png       \
-                  /usr/share/pixmaps/qdbusviewer-qt6.png             &amp;&amp;
-popd &amp;&amp;
-
-
-cat &gt; /usr/share/applications/assistant-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 Assistant
-Comment=Shows Qt6 documentation and examples
-Exec=$QT6PREFIX/bin/assistant
-Icon=assistant-qt6.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;</literal>
-EOF
-
-cat &gt; /usr/share/applications/designer-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt6 applications
-Exec=$QT6PREFIX/bin/designer
-Icon=designer-qt6.png
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/linguist-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 Linguist
-Comment=Add translations to Qt6 applications
-Exec=$QT6PREFIX/bin/linguist
-Icon=linguist-qt6.png
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;</literal>
-EOF
-
-cat &gt; /usr/share/applications/qdbusviewer-qt6.desktop &lt;&lt; EOF
-<literal>[Desktop Entry]
-Name=Qt6 QDbusViewer
-GenericName=D-Bus Debugger
-Comment=Debug D-Bus applications
-Exec=$QT6PREFIX/bin/qdbusviewer
-Icon=qdbusviewer-qt6.png
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Debugger;</literal>
-EOF</userinput></screen>
-
-<!--
-    <para>
-      Some packages such as <xref linkend='vlc'/> look for certain
-      executables with a -qt6 suffix.  Run the following command as the
-      <systemitem class="username">root</systemitem> user
-      to create the necessary symlinks:
-    </para>
-
-<screen role="root"><userinput>for file in moc uic rcc qmake lconvert lrelease lupdate; do
-  ln -sfvn $QT5BINDIR/$file /usr/bin/$file-qt6
-done</userinput></screen>
--->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-    <!--
-    <para>
-      <command>sed ...</command>: Allows using
-      <application>Python 3</application> instead of <application>Python
-      2</application>. This command destroys the build for QtWebEngine, so do
-      not use it if you remove the <parameter>-skip qtwebengine</parameter>
-      switch.
-    </para>
-
-    Ignored
-    <para>
-      <parameter>-confirm-license</parameter>: Accept license
-      without prompting user during configuration.
-    </para>
-
-    Ignored
-    <para>
-      <parameter>-opensource</parameter>: Install the opensource
-      version of <application>Qt</application>.
-    </para>
-    -->
-    <para>
-      <parameter>-nomake examples</parameter>: This switch
-      disables building of the example programs included
-      in the source tarball. Remove it if you want to build
-      them.
-    </para>
-
-    <para>
-      <parameter>-skip qt3d</parameter>: This switch
-      disables building qt3d support. There is a problem 
-      building these files without an external library
-      and no packages in BLFS use qt3d.
-    </para>
-<!-- Auto: not for me [pierre 2023/11/20]-->
-    <para>
-      <parameter>-system-sqlite</parameter>: This switch enables use
-      of the system version of <application>SQLite</application>.
-    </para>
-
-    <para>
-      <parameter>-dbus-linked</parameter>
-      <parameter>-openssl-linked</parameter>: These
-      switches enable explicit linking of the
-      <application>D-Bus</application> and
-      <application>OpenSSL</application> libraries into
-      <application>Qt6</application> libraries instead of
-      <command>dlopen()</command>-ing them.
-    </para>
-
-    <para revision="sysv">
-      <parameter>-syslog</parameter>: This switch allows to send Qt messages
-      to the <command>syslog</command> logging system.
-    </para>
-
-    <para revision="systemd">
-      <parameter>-journald</parameter>: This switch allows to send Qt messages
-      to the <command>journald</command> logging system.
-    </para>
-
-    <para>
-      <parameter>-skip qtwebengine</parameter>: This switch disables building
-      the QtWebEngine. The BLFS editors have chosen to build <xref
-      linkend="qtwebengine"/> separately.
-    </para>
-
-    <para>
-      <parameter>-skip qtquick3dphysics</parameter>: This switch disables
-      building the Qt Quick 3D Physics submodule. On 32-bit systems, this will
-      cause the build process to fail with an inlining error in Qt6's bundled
-      copy of the PhysX SDK.
-    </para>
-
-<!-- Auto
-    <para>
-      <parameter>-system-harfbuzz</parameter>: This switch enables use
-      of the system version of <application>Harfbuzz</application>.
-    </para>
--->
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring Qt6</title>
-
-    <sect3 id="qt6-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If <xref linkend="sudo"/> is installed, QT6DIR should be available to
-        the super user as well. Execute the following commands as the
-        &root; user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT6DIR</literal>
-EOF</userinput></screen>
-<!--
-      <bridgehead renderas="sect4">If you installed Qt5 in /usr</bridgehead>
-
-      <para>
-        If you installed <application>Qt5</application> in
-        <filename class="directory">/usr</filename>, create an
-        environment variable needed by certain packages.
-        As the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="nodump"><userinput>cat &gt; /etc/profile.d/qt6.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt6.sh
-
-QT5DIR=/usr
-export QT5DIR
-
-# End /etc/profile.d/qt6.sh</literal>
-EOF</userinput></screen>
-
-      <bridgehead renderas="sect4">If you did not install Qt5 in /usr</bridgehead>
-i-->
-      <para>
-        You now need to update the
-        following configuration files so that <application>Qt6</application> is
-        correctly found by other packages and system processes.
-      </para>
-
-      <para>
-        As the &root; user, update
-        the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
-        run-time cache file:
-      </para>
-
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
-<literal># Begin Qt addition
-
-/opt/qt6/lib
-
-# End Qt addition</literal>
-EOF
-
-ldconfig</userinput></screen>
-
-      <indexterm zone="qt6 qt6-config">
-        <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
-      </indexterm>
-
-      <para>
-        As the &root; user, create
-        the <filename>/etc/profile.d/qt6.sh</filename> file:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt6.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/qt6.sh
-
-QT6DIR=/opt/qt6
-
-pathappend $QT6DIR/bin           PATH
-pathappend $QT6DIR/lib/pkgconfig PKG_CONFIG_PATH
-
-export QT6DIR
-
-# End /etc/profile.d/qt6.sh</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>
-          androiddeployqt (hard link to androiddeployqt6),
-          androiddeployqt6,
-          androidtestrunner,
-          assistant,
-          balsam,
-          balsamui,
-          canbusutil,
-          cooker,
-          designer,
-          instancer,
-          lconvert,
-          linguist,
-          lrelease,
-          lupdate,
-          materialeditor,
-          meshdebug,
-          pixeltool,
-          qdbus,
-          qdbuscpp2xml,
-          qdbusviewer,
-          qdbusxml2cpp,
-          qdistancefieldgenerator,
-          qdoc,
-          qmake (hard link to qmake6),
-          qmake6,
-          qml,
-          qmldom,
-          qmleasing,
-          qmlformat,
-          qmllint,
-          qmlls,
-          qmlplugindump,
-          qmlpreview,
-          qmlprofiler,
-          qmlscene,
-          qmltc,
-          qmltestrunner,
-          qmltime,
-          qqem,
-          qsb,
-          qtdiag (hard link to qtdiag6),
-          qtdiag6,
-          qtpaths (hard link to qtpaths6),
-          qtpaths6,
-          qtplugininfo,
-          qt-cmake,
-          qt-cmake-create,
-          qt-configure-module,
-          shadergen, and
-          shapegen
-
-        </seg>
-        <seg>
-          libQt6Bluetooth.so,
-          libQt6Bodymovin.so,
-          libQt6BundledEmbree.a,
-          libQt6BundledPhysX.a,
-          libQt6BundledResonanceAudio.a,
-          libQt6Charts.so,
-          libQt6ChartsQml.so,
-          libQt6Coap.so,
-          libQt6Concurrent.so,
-          libQt6Core.so,
-          libQt6Core5Compat.so,
-          libQt6DBus.so,
-          libQt6DataVisualization.so,
-          libQt6DataVisualizationQml.so,
-          libQt6DeclarativeOpcua.so,
-          libQt6Designer.so,
-          libQt6DesignerComponents.so,
-          libQt6DeviceDiscoverySupport.a,
-          libQt6EglFSDeviceIntegration.so,
-          libQt6EglFsKmsGbmSupport.so,
-          libQt6EglFsKmsSupport.so,
-          libQt6ExampleIcons.a,
-          libQt6FbSupport.a,
-          libQt6Graphs.so,
-          libQt6Grpc.so,
-          libQt6Gui.so,
-          libQt6Help.so,
-          libQt6HttpServer.so,
-          libQt6InputSupport.a,
-          libQt6JsonRpc.so,
-          libQt6KmsSupport.a,
-          libQt6LabsAnimation.so,
-          libQt6LabsFolderListModel.so,
-          libQt6LabsQmlModels.so,
-          libQt6LabsSettings.so,
-          libQt6LabsSharedImage.so,
-          libQt6LabsWavefrontMesh.so,
-          libQt6LanguageServer.so,
-          libQt6Location.so,
-          libQt6Mqtt.so,
-          libQt6Multimedia.so,
-          libQt6MultimediaQuick.so,
-          libQt6MultimediaWidgets.so,
-          libQt6Network.so,
-          libQt6NetworkAuth.so,
-          libQt6Nfc.so,
-          libQt6OpcUa.so,
-          libQt6OpenGL.so,
-          libQt6OpenGLWidgets.so,
-          libQt6PacketProtocol.a,
-          libQt6Positioning.so,
-          libQt6PositioningQuick.so,
-          libQt6PrintSupport.so,
-          libQt6Protobuf.so,
-          libQt6Qml.so,
-          libQt6QmlCompiler.so,
-          libQt6QmlCore.so,
-          libQt6QmlDebug.a,
-          libQt6QmlDom.a,
-          libQt6QmlLocalStorage.so,
-          libQt6QmlLS.a,
-          libQt6QmlModels.so,
-          libQt6QmlToolingSettings.a,
-          libQt6QmlTypeRegistrar.a,
-          libQt6QmlWorkerScript.so,
-          libQt6QmlXmlListModel.so,
-          libQt6Quick.so,
-          libQt6Quick3D.so,
-          libQt6Quick3DAssetImport.so,
-          libQt6Quick3DAssetUtils.so,
-          libQt6Quick3DEffects.so,
-          libQt6Quick3DGlslParser.so,
-          libQt6Quick3DHelpers.so,
-          libQt6Quick3DHelpersImpl.so,
-          libQt6Quick3DIblBaker.so,
-          libQt6Quick3DParticleEffects.so,
-          libQt6Quick3DParticles.so,
-          libQt6Quick3DPhysics.so,
-          libQt6Quick3DPhysicsHelpers.so,
-          libQt6Quick3DRuntimeRender.so,
-          libQt6Quick3DSpatialAudio.so,
-          libQt6Quick3DUtils.so,
-          libQt6QuickControls2.so,
-          libQt6QuickControls2Impl.so,
-          libQt6QuickControlsTestUtils.a,
-          libQt6QuickDialogs2.so,
-          libQt6QuickDialogs2QuickImpl.so,
-          libQt6QuickDialogs2Utils.so,
-          libQt6QuickEffects.so,
-          libQt6QuickLayouts.so,
-          libQt6QuickParticles.so,
-          libQt6QuickShapes.so,
-          libQt6QuickTemplates2.so,
-          libQt6QuickTest.so,
-          libQt6QuickTestUtils.a,
-          libQt6QuickTimeline.so,
-          libQt6QuickWidgets.so,
-          libQt6RemoteObjects.so,
-          libQt6RemoteObjectsQml.so,
-          libQt6Scxml.so,
-          libQt6ScxmlQml.so,
-          libQt6Sensors.so,
-          libQt6SensorsQuick.so,
-          libQt6SerialBus.so,
-          libQt6SerialPort.so,
-          libQt6ShaderTools.so,
-          libQt6SpatialAudio.so,
-          libQt6Sql.so,
-          libQt6StateMachine.so,
-          libQt6StateMachineQml.so,
-          libQt6Svg.so,
-          libQt6SvgWidgets.so,
-          libQt6TextToSpeech.so,
-          libQt6UiTools.so,
-          libQt6VirtualKeyboard.so,
-          libQt6WaylandClient.so,
-          libQt6WaylandCompositor.so,
-          libQt6WaylandEglClientHwIntegration.so,
-          libQt6WaylandEglCompositorHwIntegration.so,
-          libQt6WebChannel.so,
-          libQt6WebChannelQuick.so,
-          libQt6WebSockets.so,
-          libQt6WebView.so,
-          libQt6WebViewQuick.so,
-          libQt6Widgets.so,
-          libQt6WlShellIntegration.so,
-          libQt6XcbQpa.so, and
-          libQt6Xml.so
-        </seg>
-        <seg>
-          <!--/usr/include/qt6,
-          /usr/lib/qt6,
-          /usr/share/doc/qt6, and
-          /usr/share/qt6
-          OR-->
-          /opt/qt6 and
-          /opt/qt-&qt6-version;
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist id='qt6-descriptions' xreflabel="Qt6 Short Descriptions">
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="assistant-qt6">
-        <term><command>assistant</command></term>
-        <listitem>
-          <para>
-            is a tool for presenting on-line documentation
-          </para>
-          <indexterm zone="qt6 assistant-qt6">
-            <primary sortas="b-assistant-qt6">assistant</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="balsam-qt6">
-        <term><command>balsam</command></term>
-        <listitem>
-          <para>
-            is a tool to convert 3D scenes from various creation tools
-            to QML format, for use by the new QtQuick 3D library
-          </para>
-          <indexterm zone="qt6 balsam-qt6">
-            <primary sortas="b-balsam-qt6">balsam</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="canbusutil-qt6">
-        <term><command>canbustil</command></term>
-        <listitem>
-          <para>
-            is a tool to deal with arbitrary CAN bus frames.
-            A Controller Area Network (CAN) is a vehicle bus standard designed
-            to allow microcontrollers and devices to communicate with each other
-            in applications without a host computer
-          </para>
-          <indexterm zone="qt6 canbusutil-qt6">
-            <primary sortas="b-canbusutil-qt6">canbusutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="designer-qt6">
-        <term><command>designer</command></term>
-        <listitem>
-          <para>
-            is a full-fledged GUI builder. It includes
-            powerful features such as preview mode, automatic widget
-            layout, support for custom widgets, and an advanced
-            property editor
-          </para>
-          <indexterm zone="qt6 designer-qt6">
-            <primary sortas="b-designer-qt6">designer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lconvert-qt6">
-        <term><command>lconvert</command></term>
-        <listitem>
-          <para>
-            is part of Qt6's Linguist tool chain. It can be used as a
-            standalone tool to convert and filter translation data files
-          </para>
-          <indexterm zone="qt6 lconvert-qt6">
-            <primary sortas="b-lconvert-qt6">lconvert</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="linguist-qt6">
-        <term><command>linguist</command></term>
-        <listitem>
-          <para>
-            provides support for translating applications into
-            local languages
-          </para>
-          <indexterm zone="qt6 linguist-qt6">
-            <primary sortas="b-linguist-qt6">linguist</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lrelease-qt6">
-        <term><command>lrelease</command></term>
-        <listitem>
-          <para>
-            is a simple command line tool. It reads XML-based translation
-            file in TS format and produces message files used by the
-            application
-          </para>
-          <indexterm zone="qt6 lrelease-qt6">
-            <primary sortas="b-lrelease-qt6">lrelease</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lupdate-qt6">
-        <term><command>lupdate</command></term>
-        <listitem>
-          <para>
-            finds the translatable
-            strings in the specified source, header and Qt Designer
-            interface files, and stores the extracted messages in
-            translation files to be processed by lrelease
-          </para>
-          <indexterm zone="qt6 lupdate-qt6">
-            <primary sortas="b-lupdate-qt6">lupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="meshdebug-qt6">
-        <term><command>meshdebug</command></term>
-        <listitem>
-          <para>
-            displays information about qtquick-3d mesh files
-          </para>
-          <indexterm zone="qt6 meshdebug-qt6">
-            <primary sortas="b-meshdebug-qt6">meshdebug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pixeltool-qt6">
-        <term><command>pixeltool</command></term>
-        <listitem>
-          <para>
-            is a desktop magnifier and as you move your mouse around
-            the screen it will show the magnified contents in its window
-          </para>
-          <indexterm zone="qt6 pixeltool-qt6">
-            <primary sortas="b-pixeltool-qt6">pixeltool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbus-qt6">
-        <term><command>qdbus</command></term>
-        <listitem>
-          <para>
-            lists available services, object paths,  methods, signals, and
-            properties of objects on a bus
-          </para>
-          <indexterm zone="qt6 qdbus-qt6">
-            <primary sortas="b-qdbus-qt6">qdbus</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbuscpp2xml-qt6">
-        <term><command>qdbuscpp2xml</command></term>
-        <listitem>
-          <para>
-            takes a C++ source file and generates a D-Bus XML definition
-            of the interface
-          </para>
-          <indexterm zone="qt6 qdbuscpp2xml-qt6">
-            <primary sortas="b-qdbuscpp2xml-qt6">qdbuscpp2xml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusviewer-qt6">
-        <term><command>qdbusviewer</command></term>
-        <listitem>
-          <para>
-            is a graphical D-Bus browser
-          </para>
-          <indexterm zone="qt6 qdbusviewer-qt6">
-            <primary sortas="b-qdbusviewer-qt6">qdbusviewer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdbusxml2cpp-qt6">
-        <term><command>qdbusxml2cpp</command></term>
-        <listitem>
-          <para>
-            is a tool that can be used to parse interface descriptions
-            and produce static code representing those interfaces,
-          </para>
-          <indexterm zone="qt6 qdbusxml2cpp-qt6">
-            <primary sortas="b-qdbusxml2cpp-qt6">qdbusxml2cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdistancefieldgenerator-qt6">
-        <term><command>qdistancefieldgenerator</command></term>
-        <listitem>
-          <para>
-            allows a font cache to be pregenerated for Text.QtRendering to speed
-            up an application's startup if the user interface has a lot of text,
-            or multiple fonts, or a large amount of distinct characters, e.g. in
-            CJK writing systems
-          </para>
-          <indexterm zone="qt6 qdistancefieldgenerator-qt6">
-            <primary sortas="b-qdistancefieldgenerator-qt6">qdistancefieldgenerator</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qdoc-qt6">
-        <term><command>qdoc</command></term>
-        <listitem>
-          <para>
-            is a tool used by <application>Qt</application> Developers to
-            generate documentation for software projects
-          </para>
-          <indexterm zone="qt6 qdoc-qt6">
-            <primary sortas="b-qdoc-qt6">qdoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmake-qt6">
-        <term><command>qmake</command></term>
-        <listitem>
-          <para>
-            uses information stored in project files to
-            determine what should go in the makefiles it
-            generates
-          </para>
-          <indexterm zone="qt6 qmake-qt6">
-            <primary sortas="b-qmake-qt6">qmake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qml-qt6">
-        <term><command>qml</command></term>
-        <listitem>
-          <para>
-            executes a QML file
-          </para>
-          <indexterm zone="qt6 qml-qt6">
-            <primary sortas="b-qml-qt6">qml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmleasing-qt6">
-        <term><command>qmleasing</command></term>
-        <listitem>
-          <para>
-            is a tool used to define the easing curves using an
-            interactive curve editor
-          </para>
-          <indexterm zone="qt6 qmleasing-qt6">
-            <primary sortas="b-qmleasing-qt6">qmleasing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlformat-qt6">
-        <term><command>qmlformat</command></term>
-        <listitem>
-          <para>
-            formats QML files according to the QML coding conventions
-          </para>
-          <indexterm zone="qt6 qmlformat-qt6">
-            <primary sortas="b-qmlformat-qt6">qmlformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmllint-qt6">
-        <term><command>qmllint</command></term>
-        <listitem>
-          <para>
-            is a syntax checker for QML files
-          </para>
-          <indexterm zone="qt6 qmllint-qt6">
-            <primary sortas="b-qmllint-qt6">qmllint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-     <varlistentry id="qmlplugindump-qt6">
-        <term><command>qmlplugindump</command></term>
-        <listitem>
-          <para>
-            is a tool to create a qmltypes file
-          </para>
-          <indexterm zone="qt6 qmlplugindump-qt6">
-            <primary sortas="b-qmlplugindump-qt6">qmlplugindump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlpreview-qt6">
-        <term><command>qmlpreview</command></term>
-        <listitem>
-          <para>
-            is a tool used to analyze QML applications
-          </para>
-          <indexterm zone="qt6 qmlpreview-qt6">
-            <primary sortas="b-qmlpreviewr-qt6">qmlpreview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlprofiler-qt6">
-        <term><command>qmlprofiler</command></term>
-        <listitem>
-          <para>
-            is a tool which watches QML and JavaScript files on disk and
-            updates the application live with any changes
-          </para>
-          <indexterm zone="qt6 qmlprofiler-qt6">
-            <primary sortas="b-qmlprofiler-qt6">qmlprofiler</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmlscene-qt6">
-        <term><command>qmlscene</command></term>
-        <listitem>
-          <para>
-            is a utility that loads and displays QML documents even before
-            the application is complete
-          </para>
-          <indexterm zone="qt6 qmlscene-qt6">
-            <primary sortas="b-qmlscene-qt6">qmlscene</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qmltestrunner-qt6">
-        <term><command>qmltestrunner</command></term>
-        <listitem>
-          <para>
-            is a tool used to make tests
-          </para>
-          <indexterm zone="qt6 qmltestrunner-qt6">
-            <primary sortas="b-qmltestrunner-qt6">qmltestrunner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtdiag-qt6">
-        <term><command>qtdiag</command></term>
-        <listitem>
-          <para>
-            is a tool for reporting diagnostic information about Qt and its
-            environment
-          </para>
-          <indexterm zone="qt6 qtdiag-qt6">
-            <primary sortas="b-qtdiag-qt6">qtdiag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtpaths-qt6">
-        <term><command>qtpaths</command></term>
-        <listitem>
-          <para>
-            is a tool to query Qt path information
-          </para>
-          <indexterm zone="qt6 qtpaths-qt6">
-            <primary sortas="b-qtpaths-qt6">qtpaths</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="qtplugininfo-qt6">
-        <term><command>qtplugininfo</command></term>
-        <listitem>
-          <para>
-            dumps meta-data about Qt plugins in JSON format
-          </para>
-          <indexterm zone="qt6 qtplugininfo-qt6">
-            <primary sortas="b-qtplugininfo-qt6">qtplugininfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/qtwebengine-kernel.xml
===================================================================
--- x/lib/qtwebengine-kernel.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,10 +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'>G</emphasis>eneral setup ---&gt;
-  -*- N<emphasis role='blue'>a</emphasis>mespaces support ---&gt;                                       [NAMESPACES]
-    # Enable or disable *both* of them:
-    [ /*] <emphasis role='blue'>U</emphasis>ser namespace                                               [USER_NS]
-    [ /*] <emphasis role='blue'>P</emphasis>ID Namespaces                                                [PID_NS]</screen>
Index: x/lib/qtwebengine.xml
===================================================================
--- x/lib/qtwebengine.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,476 +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 qtwebengine-download-http "https://download.qt.io/official_releases/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
-  <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "d2a509bd4dc6bbf1272217292546cfce">
-  <!ENTITY qtwebengine-size          "525 MB">
-  <!ENTITY qtwebengine-buildsize     "8.5 GB (319 MB installed)">
-  <!ENTITY qtwebengine-time          "60 SBU (Using parallelism=8)">
-]>
-
-<sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
-  <?dbhtml filename="qtwebengine.html"?>
-
-  <title>QtWebEngine-&qtwebengine-version;</title>
-
-  <indexterm zone="qtwebengine">
-    <primary sortas="a-qtwebengine">qtwebengine</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to QtWebEngine</title>
-
-    <para>
-      <application>QtWebEngine</application> integrates
-      <application>chromium</application>'s web capabilities into Qt. It
-      ships with its own copy of ninja which it uses for the build if it cannot
-      find a system copy, and various copies of libraries from ffmpeg, icu,
-      libvpx, and zlib (including libminizip) which have been forked by the
-      <application>chromium</application> developers.
-    </para>
-
-      <para>
-        This package and browsers using it may be useful if you need to use a
-        website designed for google chrome, or chromium, browsers.
-      </para>
-
-    <warning>
-      <para>
-        QtWebEngine uses a forked copy of chromium, and is therefore vulnerable
-        to many issues found there. The Qt developers seem to fork a newer
-        version for minor Qt versions, but because chromium moves to newer
-        versions very often, by the time the Qt developers get a forked version
-        to pass their extended tests it is always an old version and security
-        fixes from chromium (some of which have a CVE number) can take several
-        months to appear in a QtWebengine release, even if the severity has been
-        rated as Critical.
-      </para>
-
-      <para>
-        Therefore, you should be wary of using QtWebEngine in a sensitive
-        context and should always update to the next release as soon as it
-        appears in this book, even if is not flagged as a Security Update.
-        Identifying which vulnerabilities have been fixed in a particular
-        release requires pulling the appropriate 'based-NNN' branch just before
-        the previous and current releases and is often impractical. Reports of
-        fixed QTBUG items do not seem to be available and there is not any
-        documentation in the tarball for changes after the qt-5 versions.
-      </para>
-    </warning>
-
-    &lfs121_checked;
-
-    <warning>
-      <para>
-        By default, ninja will use all online CPUs +2 (if at least 4 exist),
-        even if they are not available to the current task because the build
-        terminal has been restricted with 'taskset'.  In BLFS, this package
-        takes more time to build than any other.  In one example,
-        the build of this package crashed at about the 90 percent point
-        due to an out of memory problem on a system with 24 cores and 32 GB
-        of memory.
-      </para>
-
-      <para>
-        To work around this, see the Command Explanations below.
-      </para>
-    </warning>
-<!--
-    <note>
-      <para>
-        If you  are upgrading and have installed a newer version of <xref
-        linkend='icu'/> since you last installed <xref linkend='qt5'/>, you
-        will need to reinstall Qt5 before upgrading, otherwise the final link
-        of this package will fail with a warning that the version of icu
-        libraries needed by libQt5Core.so may conflict with the version
-        used for this package.
-      </para>
-
-      <para>
-        Unusually, the shipped GN build system (used to create the Ninja files)
-        requires a static <filename class="libraryfile">libstdc++.a</filename>
-        although the installed libraries correctly use the shared version. If
-        that static library is not present, the build will fail quite quickly.
-        Please note that if you try to build webengine as part of
-        <application>Qt</application> and the static library is not available,
-        that build will either complete without installing webengine, or else
-        fail during the install (both variants were observed in 5.12.0).
-      </para>
-    </note>
--->
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&qtwebengine-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&qtwebengine-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &qtwebengine-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &qtwebengine-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &qtwebengine-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &qtwebengine-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <!\-\- keep links for releases and git versions as a reminder
-               that the tarball names names differ
-          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> \-\->
-
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-ffmpeg5_fixes-1.patch"/>
-        </para>
-      </listitem>
-  
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-icu_73-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-
-    <para role="required">
-      <xref linkend="html5lib"/>,
-      <xref linkend="nodejs"/>,
-      <xref linkend="nss"/>,
-      <xref linkend="pciutils"/>, and
-      <xref linkend='qt6'/> 
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <note>
-      <para>
-        If these packages are not installed, the build process will compile and
-        install its own (perhaps older) version, with the side effect of
-        increasing build and installed disk space and build time.
-      </para>
-    </note>
-
-    <para role="recommended">
-      either <xref linkend="alsa-lib"/> or
-      <xref linkend="pulseaudio"/> (or both),
-      <xref linkend="ffmpeg"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="libxslt"/>, and
-      <xref linkend="opus"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libevent"/>,
-      <xref linkend="mitkrb"/>,
-      <xref linkend="pipewire"/>,
-      <xref linkend="poppler"/>,
-      <ulink url="https://github.com/open-source-parsers/jsoncpp/releases">jsoncpp</ulink>,
-      <ulink url="https://github.com/cisco/libsrtp/releases">libsrtp</ulink>,
-      <ulink url="https://google.github.io/snappy/">snappy</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of qtwebengine</title>
-    <para>
-      Install <application>qtwebengine</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -D CMAKE_MESSAGE_LOG_LEVEL=STATUS             \
-      -D QT_FEATURE_webengine_system_ffmpeg=ON      \
-      -D QT_FEATURE_webengine_system_icu=ON         \
-      -D QT_FEATURE_webengine_system_libevent=ON    \
-      -D QT_FEATURE_webengine_proprietary_codecs=ON \
-      -D QT_FEATURE_webengine_webrtc_pipewire=ON    \
-      -D QT_BUILD_EXAMPLES_BY_DEFAULT=OFF           \
-      -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>
-
-    <!-- EDITORS NOTE: If you are updating this package, use INSTALL_ROOT=
-         instead of DESTDIR=    Not sure this is valid any more with version 6.6.2 -->
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>CMAKE_MESSAGE_LOG_LEVEL=STATUS</parameter>: Output
-      interesting messages that project users might be interested in.
-      Ideally these should be concise, no more than a single line, 
-      but still informative.
-    </para>
-
-    <para>
-      <parameter>QT_FEATURE_webengine_system_*</parameter>: Specify what
-      external packages the system should use.
-    </para>
-
-    <para>
-      <parameter>QT_BUILD_EXAMPLES_BY_DEFAULT=OFF</parameter>: Do not build
-      examples by default.
-    </para>
-
-    <para>
-      <option>NINJAJOBS=4 make</option>: If you patched system ninja in LFS to
-      recognize the NINJAJOBS environment variable, this command will run system
-      ninja with the specified number of jobs (i.e. 4).
-      There are several reasons why you might want to use options like this this:
-    </para>
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            Building on a subset of CPUs allows measuring the build time
-            for a smaller number of processors, and/or running other
-            CPU-intensive tasks at the same time. For an editor on a machine
-            with a lot of CPUs, trying to measure the build time for a 4-CPU
-            machine, <option>NINJAJOBS=4 make</option> will give a reasonable
-            approximation (there is a short period where N+2 python and node
-            jobs run).
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            On a machine with only 4 CPUs online, the default of scheduling
-            N+2 jobs for qtwebengine is slower by between 3% and 7%, probably
-            because of the size of the C++ files and their many includes and
-            templates. Therefore, if in doubt set NINJAJOBS to the number of CPUs.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Reducing the number of cores being used on long running, CPU
-            intensive packages may alleviate heat problems.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Reducing the number of cores will prevent potential out-of-memory
-            problems on systems that do not have enough memory (or swap)
-            when all cores are active.  A suggested approach is to limit
-            the number of cores to about one core for each 1.5 GB of
-            combined RAM and swap space.
-          </para>
-        </listitem>
-      </itemizedlist>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring QtWebEngine</title>
-
-    <sect3 id="qtwebengine-config">
-      <title>Configuration Information</title>
-
-      <para>
-        If you are upgrading from an older minor version of this
-        application, for some webpages to load you may need to
-        clear the <emphasis>browser</emphasis> caches, e.g. for
-        <application>falkon</application> they will be found in
-        <filename class="directory">~/.cache/falkon/</filename>.
-        You will need to do this if the browser starts to render
-        the page and then changes to a blank tab with a message
-        that something went wrong, and a button to Retry. Even
-        after removing the old caches, you may need to retry a
-        few times for each affected tab.
-      </para>
-
-      <para>
-        If a browser using this package fails to run and when run
-        from a term it reports 'Trace/breakpoint trap' that is
-        probably a kernel configuration issue - there is no need
-        to rebuild QtWebEngine, see the next section, recompile
-        the kernel and reboot to the new kernel.
-      </para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="kernel" id="qtwebengine-kernel">
-    <title>Kernel Configuration</title>
-
-    <para>
-      This package does not require any of the optional kernel namespace items,
-      but if User namespace is enabled <phrase revision="systemd">(as happens
-      in some unit files, for hardening)</phrase> PID namespace must also be
-      enabled. In that case enable the following options in the kernel
-      configuration and recompile the kernel if necessary:
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="qtwebengine-kernel.xml"/>
-
-    <indexterm zone="qtwebengine qtwebengine-kernel">
-      <primary sortas="d-qtwebengine">qtwebengine</primary>
-    </indexterm>
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          qtwebengine_convert_dict and
-          QtWebEngineProcess (both in $QT6DIR/libexec)
-        </seg>
-        <seg>
-          libQt6Pdf.so,
-          libQt6PdfQuick.so,
-          libQt6PdfWidgets.so,
-          libQt6WebEngineCore.so,
-          libQt6WebEngineiQuick.so,
-          libQt6WebEngineQuickDelegatesQml.so, and
-          libQt6WebEngineWidgets.so
-        </seg>
-        <seg>
-          $QT6DIR/include/QtPdf,
-          $QT6DIR/include/QtPdfQuick,
-          $QT6DIR/include/QtPdfWidgets,
-          $QT6DIR/include/QtWebEngineCore,
-          $QT6DIR/include/QtWebEngineQuick,
-          $QT6DIR/include/QtWebEngineWidgets,
-          $QT6DIR/qml/QtWebEngine, and
-          $QT6DIR/translations/qtwebengine_locales
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="qtwebengine_convert_dict">
-        <term><command>qtwebengine_convert_dict</command></term>
-        <listitem>
-          <para>
-            converts hunspell dictionaries (<literal>.dic</literal>) to chromium
-            format (<literal>.bdic</literal>)
-          </para>
-          <indexterm zone="qtwebengine qtwebengine_convert_dict">
-            <primary sortas="b-qtwebengine_convert_dict">qtwebengine_convert_dict</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="QtWebEngineProcess">
-        <term><command>QtWebEngineProcess</command></term>
-        <listitem>
-          <para>
-            is a libexec program which runs a zygote process (one that listens
-            for spawn requests from a master process and will fork itself in
-            response)
-          </para>
-          <indexterm zone="qtwebengine QtWebEngineProcess">
-            <primary sortas="b-QtWebEngineProcess">QtWebEngineProcess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!--
-      <varlistentry id="libQtWebEngine-lib">
-        <term><filename class="libraryfile">libQtWebEngine.so</filename></term>
-        <listitem>
-          <para>
-            provides QML types for rendering web content within a QML application
-          </para>
-          <indexterm zone="qtwebengine libQtWebEngine-lib">
-            <primary sortas="c-libQtWebEngine">libQtWebEngine.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQtWebEngineCore">
-        <term><filename class="libraryfile">libQtWebEngineCore.so</filename></term>
-        <listitem>
-          <para>
-            provides public API shared by both QtWebEngine and QtWebEngineWidgets
-          </para>
-          <indexterm zone="qtwebengine libQtWebEngineCore">
-            <primary sortas="c-libQtWebEngineCore">libQtWebEngineCore.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libQtWebEngineWidgets">
-        <term><filename class="libraryfile">libQtWebEngineWidgets.so</filename></term>
-        <listitem>
-          <para>
-            provides a web browser engine as well as C++ classes to render and
-            interact with web content
-          </para>
-          <indexterm zone="qtwebengine libQtWebEngineWidgets">
-            <primary sortas="c-libQtWebEngineWidgets">libQtWebEngineWidgets.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/startup-notification.xml
===================================================================
--- x/lib/startup-notification.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 startup-notification-download-http "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-&startup-notification-version;.tar.gz">
-  <!ENTITY startup-notification-download-ftp  " ">
-  <!ENTITY startup-notification-md5sum        "2cd77326d4dcaed9a5a23a1232fb38e9">
-  <!ENTITY startup-notification-size          "347 KB">
-  <!ENTITY startup-notification-buildsize     "4 MB">
-  <!ENTITY startup-notification-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="startup-notification"
-xreflabel="startup-notification-&startup-notification-version;">
-  <?dbhtml filename="startup-notification.html"?>
-
-
-  <title>startup-notification-&startup-notification-version;</title>
-
-  <indexterm zone="startup-notification">
-    <primary sortas="a-startup-notification">startup-notification</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to startup-notification</title>
-
-    <para>
-      The <application>startup-notification</application> package
-      contains <filename class="libraryfile">startup-notification</filename>
-      libraries. These are useful for building a consistent manner to notify
-      the user through the cursor that the application is loading.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&startup-notification-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&startup-notification-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &startup-notification-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &startup-notification-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &startup-notification-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &startup-notification-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">startup-notification Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="xorg7-lib"/> and
-      <xref linkend="xcb-util"/>
-    </para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of startup-notification</title>
-
-    <para>
-      Install <application>startup-notification</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 &amp;&amp;
-install -v -m644 -D doc/startup-notification.txt \
-    /usr/share/doc/startup-notification-&startup-notification-version;/startup-notification.txt</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>libstartup-notification-1.so</seg>
-        <seg>/usr/include/startup-notification-1.0 and
-        /usr/share/doc/startup-notification-&startup-notification-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libstartup-notification-1">
-        <term><filename class="libraryfile">libstartup-notification-1.so</filename></term>
-        <listitem>
-          <para>
-            provides the functions to assist applications in communicating
-            with the cursor system to provide feedback to the user that the
-            application is loading
-          </para>
-          <indexterm zone="startup-notification libstartup-notification-1">
-            <primary sortas="c-libstartup-notification-1">libstartup-notification-1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/tepl.xml
===================================================================
--- x/lib/tepl.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 tepl-download-http "&gnome-download-http;/tepl/6.9/tepl-&tepl-version;.tar.xz">
-  <!ENTITY tepl-download-ftp  " ">
-  <!ENTITY tepl-md5sum        "4d98792c8c338a107114a61a806e5d47">
-  <!ENTITY tepl-size          "168 KB">
-  <!ENTITY tepl-buildsize     "9.7 MB (with tests)">
-  <!ENTITY tepl-time          "0.3 SBU (with tests)">
-
-]>
-
-<sect1 id="tepl" xreflabel="tepl-&tepl-version;">
-  <?dbhtml filename="tepl.html"?>
-
-
-  <title>Tepl-&tepl-version;</title>
-
-  <indexterm zone="tepl">
-    <primary sortas="a-tepl">tepl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Tepl</title>
-
-    <para>
-      The <application>Tepl</application> package contains a library that eases
-      the development of GtkSourceView-based text editors and IDEs.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&tepl-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&tepl-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &tepl-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &tepl-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &tepl-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &tepl-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Tepl Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gsettings-desktop-schemas"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="libgedit-amtk"/>,
-      <xref linkend="libgedit"/>, 
-      <xref linkend="libhandy1"/>, and
-      <xref linkend="uchardet"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation) and
-      <xref linkend="valgrind"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tepl</title>
-
-    <para>
-      Install <application>Tepl</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir tepl-build &amp;&amp;
-cd    tepl-build &amp;&amp;
-
-meson setup --prefix=/usr       \
-            --buildtype=release \
-            -Dgtk_doc=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"/>
-
-    <para>
-      <parameter>-Dgtk_doc=false</parameter>: Disables building the API
-      documentation. Remove if you have <xref linkend="gtk-doc"/> installed
-      and wish to build 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>
-          libtepl-6.so
-        </seg>
-        <seg>
-          /usr/include/tepl-6 and
-          /usr/share/gtk-doc/html/tepl-6.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtepl-6">
-        <term><filename class="libraryfile">libtepl-6.so</filename></term>
-        <listitem>
-          <para>
-            contains convenience functions for GtkSourceView4-based programs
-          </para>
-          <indexterm zone="tepl libtepl-6">
-            <primary sortas="c-libtepl-6">libtepl-6.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-
-</sect1>
Index: x/lib/vulkan-headers.xml
===================================================================
--- x/lib/vulkan-headers.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,128 +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 vulkan-headers-download-http "https://github.com/KhronosGroup/Vulkan-Headers/archive/v&vulkan-headers-version;/Vulkan-Headers-&vulkan-headers-version;.tar.gz">
-  <!ENTITY vulkan-headers-download-ftp  " ">
-  <!ENTITY vulkan-headers-md5sum        "f277bc222cfb6a2727c28d3504943fac">
-  <!ENTITY vulkan-headers-size          "2.1 MB">
-  <!ENTITY vulkan-headers-buildsize     "27 MB">
-  <!ENTITY vulkan-headers-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="vulkan-headers" xreflabel="Vulkan-Headers-&vulkan-headers-version;">
-  <?dbhtml filename="vulkan-headers.html"?>
-
-  <title>Vulkan-Headers-&vulkan-headers-version;</title>
-
-  <indexterm zone="vulkan-headers">
-    <primary sortas="a-vulkan-headers">Vulkan-Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vulkan-headers</title>
-
-    <para>
-      The <application>Vulkan-Headers</application> package contains a set of
-      header files necessary to build and link applications against the Vulkan
-      API.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vulkan-headers-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vulkan-headers-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vulkan-headers-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vulkan-headers-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vulkan-headers-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vulkan-headers-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vulkan-Headers Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vulkan-Headers</title>
-
-    <para>
-      Install <application>Vulkan-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/vk_video,
-          /usr/include/vulkan,
-          /usr/share/cmake/VulkanHeaders, and
-          /usr/share/vulkan
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: x/lib/vulkan-loader.xml
===================================================================
--- x/lib/vulkan-loader.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 vulkan-loader-download-http "https://github.com/KhronosGroup/Vulkan-Loader/archive/v&vulkan-loader-version;/Vulkan-Loader-&vulkan-loader-version;.tar.gz">
-  <!ENTITY vulkan-loader-download-ftp  " ">
-  <!ENTITY vulkan-loader-md5sum        "db25c5ba4b50a99341ffaa18b4c56424">
-  <!ENTITY vulkan-loader-size          "1.6 MB">
-  <!ENTITY vulkan-loader-buildsize     "9.2 MB">
-  <!ENTITY vulkan-loader-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="vulkan-loader" xreflabel="Vulkan-Loader-&vulkan-loader-version;">
-  <?dbhtml filename="vulkan-loader.html"?>
-
-  <title>Vulkan-Loader-&vulkan-loader-version;</title>
-
-  <indexterm zone="vulkan-loader">
-    <primary sortas="a-vulkan-loader">Vulkan-Loader</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Vulkan-Loader</title>
-
-    <para>
-      The <application>Vulkan-Loader</application> package contains a library
-      which provides the Vulkan API and provides core support for graphics
-      drivers for Vulkan.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&vulkan-loader-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&vulkan-loader-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &vulkan-loader-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &vulkan-loader-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &vulkan-loader-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &vulkan-loader-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Vulkan-loader Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="vulkan-headers"/>,
-      <xref linkend="wayland"/>, and
-      <xref linkend="xorg7-lib"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended (Runtime)</bridgehead>
-    <para role="runtime">
-      <xref linkend="mesa"/> (for Vulkan drivers)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vulkan-Loader</title>
-
-    <note>
-      <para>
-        If this package is being installed on a system where Mesa has already
-        been installed previously, please rebuild <xref linkend="mesa"/> after
-        this package to install Vulkan graphics drivers.
-      </para>
-    </note>
-
-    <para>
-      Install <application>Vulkan-Loader</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        \
-      -DCMAKE_SKIP_RPATH=TRUE           \
-      -G Ninja .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not come with a working test suite.
-      <!-- To run the tests, we need to follow a complex process to download a
-      customized copy of googletest.-->
-    </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>
-          libvulkan.so
-        </seg>
-        <seg>
-          /usr/lib/cmake/VulkanLoader
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libvulkan">
-        <term><filename class="libraryfile">libvulkan.so</filename></term>
-        <listitem>
-          <para>
-            provides the Vulkan API and core support for graphics drivers
-          </para>
-          <indexterm zone="vulkan-loader libvulkan">
-            <primary sortas="c-libvulkan">libvulkan.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </sect2>
-</sect1>
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,508 +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 webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
-  <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "b3a4504892162b30a774d3afde4707f7">
-  <!ENTITY webkitgtk-size          "35 MB">
-  <!ENTITY webkitgtk-buildsize     "1.2 GB (156 MB installed, add 151 MB for GTK-4)">
-  <!ENTITY webkitgtk-time          "25 SBU (for GTK-3, using parallelism=8, add 25 SBU for GTK-4)">
-
-  <!ENTITY libbacktrace
-    "<ulink url='https://github.com/ianlancetaylor/libbacktrace'>libbacktrace</ulink>">
-]>
-
-<sect1 id="webkitgtk" xreflabel="WebKitGTK-&webkitgtk-version;">
-  <?dbhtml filename="webkitgtk.html"?>
-
-
-  <title>WebKitGTK-&webkitgtk-version;</title>
-
-  <indexterm zone="webkitgtk">
-    <primary sortas="a-WebKitGTK">WebKitGTK</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to WebKitGTK</title>
-
-    <para>
-      The <application>WebKitGTK</application> package is a port of the
-      portable web rendering engine <application>WebKit</application> to the
-      <application>GTK+ 3</application> and <application>GTK 4</application>
-      platforms.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&webkitgtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&webkitgtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &webkitgtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &webkitgtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &webkitgtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &webkitgtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-upstream_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-
-    <bridgehead renderas="sect3">WebKitGTK Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cairo"/>,
-      <xref linkend="cmake"/>,
-      <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gst10-plugins-bad"/>,
-      <xref linkend="gtk3"/>,
-      <xref linkend="gtk4"/>,
-      <xref linkend="icu"/>,
-      <xref linkend="lcms2"/>,
-      <xref linkend="libgudev"/>,
-      <xref linkend="libsecret"/>,
-      <xref linkend="libsoup3"/>,
-      <xref linkend="libtasn1"/>,
-      <xref linkend="libwebp"/>,
-      <xref linkend="mesa"/>,
-      <xref linkend="openjpeg2"/>,
-      <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="unifdef"/>, and
-      <xref linkend="which"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bubblewrap"/>,
-      <xref linkend="enchant"/>,
-      <xref linkend="geoclue2"/>,
-      &gobject-introspection;,
-      <xref linkend="hicolor-icon-theme"/>,
-      <xref linkend="libavif"/>,
-      <xref linkend="libjxl"/>,
-      <xref linkend="libseccomp"/>, and
-      <xref linkend="xdg-dbus-proxy"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="gi-docgen"/>,
-      <xref linkend="harfbuzz"/>,
-      <xref linkend="wayland"/>,
-      <xref linkend="woff2"/>,
-      <ulink url="https://ccache.dev/">ccache</ulink>,
-      <ulink url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>,
-      &libbacktrace;, and
-      <!--<ulink url="https://github.com/libjxl/libjxl">libjxl</ulink>, and-->
-      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of WebKitGTK</title>
-
-    <bridgehead renderas="sect3">Installation of
-    <application>WebKitGTK</application></bridgehead>
-
-    <important>
-      <para>
-        This package allows building with either GTK-3 or GTK-4, but not both
-        in the same build. The GTK-4 version is needed for packages such as
-        <xref linkend="epiphany"/>. Other packages, such as
-        <xref linkend="balsa"/> or <xref linkend="evolution"/>, require the
-        GTK-3 version. Both versions can be installed side by side on the
-        same system. We give build instructions for both cases below, but
-        the only difference is the setting of <command>-DUSE_GTK4</command>
-      </para>
-    </important>
-
-    <para>
-      If you want to install the GTK+-3 version of
-      <application>WebKitGTK</application>, run the following commands:
-    </para>
-
-<screen revision="systemd"><userinput>mkdir -vp build &amp;&amp;
-cd        build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=OFF              \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>mkdir -vp build &amp;&amp;
-cd        build &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=OFF              \
-      -DENABLE_JOURNALD_LOG=OFF   \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      This package does not have a working test suite. However, there is a
-      usable basic graphical web browser in the build directory,
-      <application>build/bin/MiniBrowser</application>. If launching it fails,
-      there is a problem with the build.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      If you want to install the GTK4 version of
-      <application>WebKitGTK</application>, run the following commands:
-    </para>
-
-<screen revision="systemd"><userinput>rm -rf * .[^.]* &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=ON               \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-<screen revision="sysv"><userinput>rm -rf * .[^.]* &amp;&amp;
-
-cmake -DCMAKE_BUILD_TYPE=Release  \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_SKIP_RPATH=ON       \
-      -DPORT=GTK                  \
-      -DLIB_INSTALL_DIR=/usr/lib  \
-      -DUSE_LIBBACKTRACE=OFF      \
-      -DUSE_LIBHYPHEN=OFF         \
-      -DENABLE_GAMEPAD=OFF        \
-      -DENABLE_MINIBROWSER=ON     \
-      -DENABLE_DOCUMENTATION=OFF  \
-      -DUSE_WOFF2=OFF             \
-      -DUSE_GTK4=ON               \
-      -DENABLE_JOURNALD_LOG=OFF   \
-      -DENABLE_BUBBLEWRAP_SANDBOX=ON \
-      -Wno-dev -G Ninja ..        &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para>
-      As the <option>-DENABLE_DOCUMENTATION=OFF</option> option is used,
-      the documentation is not rebuilt nor installed now.  If you need the
-      documentation, you can either install <xref linkend='gi-docgen'/>
-      and remove this option from the <command>cmake</command> command,
-      or install the pre-built documentation (only for the GTK-4 version)
-      instead:
-    </para>
-
-<screen role='root'><userinput>install -vdm755 /usr/share/gtk-doc/html &amp;&amp;
-cp -rv ../Documentation/* /usr/share/gtk-doc/html</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-<!--    <para>
-      <command>sed ... TextCheckerEnchant.cpp</command>: This command
-      is needed to allow the build to complete with enchant-2.x.
-    </para> -->
-
-    <para>
-      <parameter>-DUSE_LIBBACKTRACE=OFF</parameter>: This switch disables
-      the use of libbacktrace for dumping a stack trace when a crash
-      happens.  You need to install &libbacktrace; if you wish to enable it
-      (replacing OFF with ON or just removing the switch).
-    </para>
-
-    <para>
-      <parameter>-DUSE_LIBHYPHEN=OFF</parameter>: This switch disables the
-      default automatic hyphenation implementation. You need to install
-      <ulink
-      url="https://sourceforge.net/projects/hunspell/files/Hyphen/">Hyphen</ulink>
-      if you wish to enable it (replacing OFF with ON or just removing
-      the switch).
-    </para>
-
-    <para>
-      <parameter>-DENABLE_DOCUMENTATION=OFF</parameter>: This switch disables
-      regenerating the documentation. Remove this switch if you have
-      <xref linkend="gi-docgen"/>
-      installed and wish to regenerate the documentation.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_GAMEPAD=OFF</parameter>: This switch disables
-      gamepad support. Remove this switch if you have
-      <ulink url="https://gnome.pages.gitlab.gnome.org/libmanette/">libmanette</ulink>
-      installed and wish to enable it.
-    </para>
-
-    <para>
-      <parameter>-DENABLE_MINIBROWSER=ON</parameter>: This switch enables
-      compiling and installing the MiniBrowser.
-    </para>
-
-<!--
-    <para>
-      <parameter>-DUSE_JPEGXL=OFF</parameter>: This switch turns off support
-      for JPEG-XL images. Remove it if you have the optional package
-      <ulink url="https://github.com/libjxl/libjxl">libjxl</ulink> installed.
-    </para>
--->
-    <para>
-      <parameter>-DENABLE_BUBBLEWRAP_SANDBOX=ON</parameter>: This switch
-      enables the Bubblewrap sandbox, which helps mitigate the impact of most
-      security vulnerabilities in this package. Change this switch to OFF if
-      you do not want to install <xref linkend="bubblewrap" role="nodep"/>,
-      <xref linkend='libseccomp' role="nodep"/>, or
-      <xref linkend="xdg-dbus-proxy" role="nodep"/>, but note that this may
-      put you at risk.
-      <!-- Note: This works well on both i686 and x86_64. -renodr -->
-    </para>
-
-    <para revision="sysv">
-      <parameter>-DENABLE_JOURNALD_LOG=OFF</parameter>: This switch disables using the
-      systemd journal for logging errors and debugging information since it
-      is not available on SysV systems.
-    </para>
-
-    <para>
-      <option>-DUSE_SYSTEM_MALLOC=ON</option>: This switch enables building
-      against the system installed <application>malloc</application>.
-    </para>
-
-    <para>
-      <option>-DENABLE_GEOLOCATION=OFF</option>: Use this switch if you don't
-      want to install <xref linkend="geoclue2"/>.
-    </para>
-
-    <para>
-      <option>-DUSE_AVIF=OFF</option>: Use this switch if you don't want to
-      install <xref linkend="libavif"/>. Note that you will not have support
-      for AVIF images if you do this.
-    </para>
-
-    <para>
-      <option>-DUSE_WOFF2=ON</option>: Use this switch if the optional
-      package <xref linkend="woff2"/> is installed. This adds additional
-      support for fonts.
-    </para>
-
-    <para>
-      <option>-DUSE_JPEGXL=OFF</option>: Use this switch if the recommended
-      package <xref linkend="libjxl"/> is not installed. Note that you will not
-      have support for JPEG XL images if this option is passed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-<!-- Moved to /usr/libexec/webkit2gtk-4.0, so shouldn't appear here
-          jsc,
-          MiniBrowser, and -->
-          WebKitWebDriver
-        </seg>
-        <seg>
-          libjavascriptcoregtk-4.1.so,
-          libjavascriptcoregtk-6.0.so,
-          libwebkit2gtk-4.1.so, and
-          libwebkitgtk-6.0.so
-        </seg>
-        <seg>
-          /usr/include/webkitgtk-4.1,
-          /usr/include/webkitgtk-6.0,
-          /usr/lib{,exec}/webkit2gtk-4.1,
-          /usr/lib{,exec}/webkitgtk-6.0,
-          /usr/share/gtk-doc/html/{jsc-glib,webkit2gtk{,-web-extension}}-4.1
-          (optional), and
-          /usr/share/gtk-doc/html/{jsc-glib,webkit2gtk{,-web-process-extension}}-6.0
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-<!--
-      <varlistentry id="jsc">
-        <term><command>jsc</command></term>
-        <listitem>
-          <para>
-            is a command-line utility that allows you to run JavaScript programs
-            outside of the context of a web browser.
-          </para>
-          <indexterm zone="webkitgtk jsc">
-            <primary sortas="b-jsc">jsc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="MiniBrowser">
-        <term><command>MiniBrowser</command></term>
-        <listitem>
-          <para>
-            is a very simple graphical browser.
-          </para>
-          <indexterm zone="webkitgtk MiniBrowser">
-            <primary sortas="b-MiniBrowser">MiniBrowser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
--->
-      <varlistentry id="WebKitWebDriver">
-        <term><command>WebKitWebDriver</command></term>
-        <listitem>
-          <para>
-            allows debugging and automation of web pages and browsers
-          </para>
-          <indexterm zone="webkitgtk WebKitWebDriver">
-            <primary sortas="b-WebKitWebDriver">WebKitWebDriver</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-4.1">
-        <term>
-          <filename class="libraryfile">libjavascriptcoregtk-4.1.so</filename>
-        </term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc</command> and
-            <filename class="libraryfile">libwebkit2gtk-4.1</filename>
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-4.1">
-            <primary sortas="c-libjavascriptcoregtk-4.1">libjavascriptcoregtk-4.1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-6.0">
-        <term><filename class="libraryfile">libjavascriptcoregtk-6.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by
-            <command>jsc</command> and
-            <filename class="libraryfile">libwebkitgtk-6.0</filename>
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-6.0">
-            <primary sortas="c-libjavascriptcoregtk-6.0">libjavascriptcoregtk-6.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkit2gtk-4">
-        <term><filename class="libraryfile">libwebkit2gtk-4.1.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit2</application> API functions
-          </para>
-          <indexterm zone="webkitgtk libwebkit2gtk-4">
-            <primary sortas="c-libwebkit2gtk-4">libwebkit2gtk-4.1.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-6">
-        <term><filename class="libraryfile">libwebkitgtk-6.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit</application> API functions for
-            GTK-4 applications
-          </para>
-          <indexterm zone="webkitgtk libwebkitgtk-6">
-            <primary sortas="c-libwebkitgtk-6">libwebkitgtk-6.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: x/lib/xdg-desktop-portal-gtk.xml
===================================================================
--- x/lib/xdg-desktop-portal-gtk.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(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 xdg-desktop-portal-gtk-download-http "https://github.com/flatpak/xdg-desktop-portal-gtk/releases/download/&xdg-desktop-portal-gtk-version;/xdg-desktop-portal-gtk-&xdg-desktop-portal-gtk-version;.tar.xz">
-  <!ENTITY xdg-desktop-portal-gtk-download-ftp  " ">
-  <!ENTITY xdg-desktop-portal-gtk-md5sum        "9c7836b1fe09bc914ea4c06b9c58231f">
-  <!ENTITY xdg-desktop-portal-gtk-size          "89 KB">
-  <!ENTITY xdg-desktop-portal-gtk-buildsize     "9.7 MB">
-  <!ENTITY xdg-desktop-portal-gtk-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="xdg-desktop-portal-gtk" xreflabel="xdg-desktop-portal-gtk-&xdg-desktop-portal-gtk-version;">
-  <?dbhtml filename="xdg-desktop-portal-gtk.html"?>
-
-  <title>xdg-desktop-portal-gtk-&xdg-desktop-portal-gtk-version;</title>
-
-  <indexterm zone="xdg-desktop-portal-gtk">
-    <primary sortas="a-xdg-desktop-portal-gtk">xdg-desktop-portal-gtk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-desktop-portal-gtk</title>
-
-    <para>
-      <application>xdg-desktop-portal-gtk</application> is a backend for
-      <application>xdg-desktop-portal</application>, that is using GTK and
-      various pieces of GNOME infrastructure.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-desktop-portal-gtk-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-desktop-portal-gtk-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-desktop-portal-gtk-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-desktop-portal-gtk-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-desktop-portal-gtk-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-desktop-portal-gtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-desktop-portal-gtk Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="gtk3"/> and
-      <xref linkend="xdg-desktop-portal"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="gnome-desktop"/> (for compiling more portal interfaces)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-desktop-portal-gtk</title>
-
-    <para>
-      Install <application>xdg-desktop-portal-gtk</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 &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para revision="sysv">
-      Remove systemd files that are useless (as the &root; user):
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -rvf /usr/lib/systemd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>
-          one daemon in /usr/libexec
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          /usr/share/xdg-desktop-portal (if no other
-          <application>xdg-desktop-portal</application> backend is installed)
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
Index: x/lib/xdg-desktop-portal.xml
===================================================================
--- x/lib/xdg-desktop-portal.xml	(revision cdbcb2480f1c942b65f420150b8d0ce5dd2e94ca)
+++ 	(revision )
@@ -1,225 +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 xdg-desktop-portal-download-http "https://github.com/flatpak/xdg-desktop-portal/releases/download/&xdg-desktop-portal-version;/xdg-desktop-portal-&xdg-desktop-portal-version;.tar.xz">
-  <!ENTITY xdg-desktop-portal-download-ftp  " ">
-  <!ENTITY xdg-desktop-portal-md5sum        "20e0b28c1528e57b13cc236ba7840e03">
-  <!ENTITY xdg-desktop-portal-size          "683 KB">
-  <!ENTITY xdg-desktop-portal-buildsize     "51 MB (with tests)">
-  <!ENTITY xdg-desktop-portal-time          "0.1 SBU (add 0.4 SBU for tests; with parallelism=4)">
-]>
-
-<sect1 id="xdg-desktop-portal" xreflabel="xdg-desktop-portal-&xdg-desktop-portal-version;">
-  <?dbhtml filename="xdg-desktop-portal.html"?>
-
-  <title>xdg-desktop-portal-&xdg-desktop-portal-version;</title>
-
-  <indexterm zone="xdg-desktop-portal">
-    <primary sortas="a-xdg-desktop-portal">xdg-desktop-portal</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to xdg-desktop-portal</title>
-
-    <para>
-      <application>xdg-desktop-portal</application> is a D-Bus service that
-      allows applications to interact with the desktop in a safe way. Several
-      aspects of desktop interaction, like file chooser, desktop style, etc
-      are implemented in different D-Bus APIs, known as
-      <emphasis>portals</emphasis>. Sandboxed
-      applications benefit the most from this service since they don't need
-      special permissions to use the portal APIs, but any application can use
-      it. <application>xdg-desktop-portal</application> safeguards many
-      resources and features with a user-controlled permission system. This
-      service needs a backend implementing desktop-specific portal interfaces.
-    </para>
-
-    &lfs121_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&xdg-desktop-portal-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&xdg-desktop-portal-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &xdg-desktop-portal-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &xdg-desktop-portal-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &xdg-desktop-portal-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &xdg-desktop-portal-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">xdg-desktop-portal Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="fuse3"/>,
-      <xref linkend="gdk-pixbuf"/>,
-      <xref linkend="json-glib"/>,
-      <xref linkend="pipewire"/>, and
-      <xref role="runtime" linkend="dbus"/> (at runtime).
-      Furthermore, a backend is needed at runtime for this package to be of
-      any use, either
-      <xref role="runtime" linkend="xdg-desktop-portal-gtk"/> or
-      <xref role="nodep" linkend="xdg-desktop-portal-gnome"/> or
-      <xref role="nodep" linkend="xdg-desktop-portal-lxqt"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="bubblewrap"/> and
-      <xref linkend="docutils"/> (for building the manual pages)
-    </para>
-
-    <note>
-      <para>
-        Although there is an option to build the package
-        without <application>bubblewrap</application>, upstream
-        developers and LFS editors alike highly recommend to not
-        use this possibility, that would create a big security
-        hole.
-      </para>
-    </note>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="geoclue2"/> (for the <quote>location</quote> portal), and
-      <xref linkend="pytest"/> with
-      <xref linkend="libportal"/> and
-      <xref linkend="python-dbusmock"/> (for running tests)
-    </para>
-
-    <bridgehead renderas="sect4">Optional (for building
-      the documentation)</bridgehead>
-    <para role="optional">
-      <xref linkend="sphinx"/> with
-      <ulink url="https://pypi.org/project/sphinxext-opengraph/">sphinxext.opengraph</ulink>,
-      <ulink url="https://pypi.org/project/sphinx-copybutton/">sphinx_copybutton</ulink>,
-      <ulink url="https://pypi.org/project/furo/">furo</ulink>, and
-      <ulink url="https://github.com/flatpak/flatpak">flatpak</ulink>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of xdg-desktop-portal</title>
-
-    <para>
-      Install <application>xdg-desktop-portal</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>
-      If you have installed the needed dependencies, you can test the results
-      by running <command>ninja test</command>.<phrase revision="systemd">
-      Six tests are known to fail if you are not using
-      <xref linkend="gnome-terminal"/> and are in GNOME.</phrase>
-    </para>
-
-    <para>
-      Now, as the &root; user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    <para revision="sysv">
-      Remove systemd files that are useless (as the &root; user):
-    </para>
-
-<screen role="root" revision="sysv"><userinput>rm -rvf /usr/lib/systemd</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring xdg-desktop-portal</title>
-
-    <sect3 id="xdg-desktop-portal-config">
-      <title>Config Files</title>
-      <para>
-        The main configuration files are
-        <filename>~/.config/xdg-desktop-portal/portals.conf</filename>,
-        <filename>/etc/xdg-desktop-portal/portals.conf</filename>, and
-        <filename>/usr/share/xdg-desktop-portal/portals.conf</filename>.
-        Several other locations can be searched for configuration files. See
-        <ulink role='man' url='&man;portals.conf.5'>portals.conf(5)</ulink>.
-      </para>
-
-      <indexterm zone="xdg-desktop-portal xdg-desktop-portal-config">
-        <primary sortas="e-AA.config-xdg-desktop-portal-portals.conf">~/.config/xdg-desktop-portal/portals.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-desktop-portal xdg-desktop-portal-config">
-        <primary
-        sortas="e-etc-xdg-desktop-portal-portals.conf">/etc/xdg-desktop-portal/portals.conf</primary>
-      </indexterm>
-
-      <indexterm zone="xdg-desktop-portal xdg-desktop-portal-config">
-        <primary
-        sortas="e-usr-share-xdg-desktop-portal-portals.conf">/usr/share/xdg-desktop-portal/portals.conf</primary>
-      </indexterm>
-    </sect3>
-
-    <sect3><title>Configuration Information</title>
-
-      <para>
-        The various configuration files are used to choose the backend
-        depending of various conditions. See
-        <ulink role='man' url='&man;portals.conf.5'>portals.conf(5)</ulink>
-        for details.
-      </para>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Librar(y,ies)</segtitle>
-      <segtitle>Installed Director(y,ies)</segtitle>
-
-      <seglistitem>
-        <seg>
-          several daemons in /usr/libexec
-        </seg>
-        <seg>
-          None
-        </seg>
-        <seg>
-          None
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-</sect1>
