Index: general/prog/asciidoc.xml
===================================================================
--- general/prog/asciidoc.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect2 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 asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
-  <!ENTITY asciidoc-download-ftp  " ">
-  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
-  <!ENTITY asciidoc-size          "212 KB">
-  <!ENTITY asciidoc-buildsize     "2.6 MB">
-  <!ENTITY asciidoc-time          "less than 0.1 SBU">
-]>
-
-<!-- Begin Py3c -->
-  <sect2 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
-
-    <title>Asciidoc-&asciidoc-version;</title>
-
-    <indexterm zone="asciidoc">
-      <primary sortas="a-asciidoc">asciidoc</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Asciidoc Module</title>
-
-      <para>
-        The <application>Asciidoc</application> package is a text document
-        format for writing notes, documentation, articles, books, ebooks,
-        slideshows, web pages, man pages and blogs. AsciiDoc files can be
-        translated to many formats including HTML, PDF, EPUB, and man page.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &asciidoc-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &asciidoc-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &asciidoc-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &asciidoc-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
-      <para role="optional">
-        <xref linkend="docbook-xsl"/>,
-        <xref linkend="fop"/>,
-        <xref linkend="libxslt"/>,
-        <xref linkend="lynx"/>,
-        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
-        <ulink url="&w3m-url;">W3m</ulink>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Asciidoc</title>
-<!-- version 9.x is from blfs 11.0. We are now at 11.1
-      <para>
-        If you are upgrading from version 9.x, remove the previously installed
-        executables, as the <systemitem class="username">root</systemitem>
-        user:
-      </para>
-
-<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
--->
-    <para> Build the module: </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            a2x and
-            asciidoc
-          </seg>
-          <seg>None</seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
-            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="a2x">
-          <term><command>a2x</command></term>
-          <listitem>
-            <para>
-              is a toolchain manager for AsciiDoc
-              (converts Asciidoc text files to other file formats)
-            </para>
-            <indexterm zone="asciidoc a2x">
-              <primary sortas="b-a2x">a2x</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="asciidoc-prog">
-          <term><command>asciidoc</command></term>
-          <listitem>
-            <para>
-              converts an AsciiDoc text file to HTML or DocBook
-            </para>
-            <indexterm zone="asciidoc asciidoc-prog">
-              <primary sortas="b-asciidoc-prog">asciidoc</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-      </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/cython.xml
===================================================================
--- general/prog/cython.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect2 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 cython-download-http "https://github.com/cython/cython/releases/download/&cython-version;/Cython-&cython-version;.tar.gz">
-  <!ENTITY cython-download-ftp  " ">
-  <!ENTITY cython-md5sum        "91c36ea86c00adcc5c1c11cf48b733c0">
-  <!ENTITY cython-size          "2.0 MB">
-  <!ENTITY cython-buildsize     "61 MB">
-  <!ENTITY cython-time          "0.5 SBU">
-]>
-
-<!-- Begin Py3c -->
-  <sect2 id="cython" xreflabel="cython-&cython-version;">
-
-    <title>Cython-&cython-version;</title>
-
-    <indexterm zone="cython">
-      <primary sortas="a-cython">cython</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Cython Module</title>
-
-      <para>
-        The <application>Cython</application> package provides a
-         compiler for writing C extensions for the Python language.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&cython-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&cython-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &cython-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &cython-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &cython-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &cython-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Cython</title>
-
-    <para> Build the module: </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user Cython</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/Cython and
-            /usr/lib/python&python3-majorver;/site-packages/Cython-&cython-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/dbus-python.xml
===================================================================
--- general/prog/dbus-python.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY dbus-python-download-http "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
-  <!ENTITY dbus-python-download-ftp  " ">
-  <!ENTITY dbus-python-md5sum        "33be8a4a766e1c7c9a377b8f934ce21a">
-  <!ENTITY dbus-python-size          "592 KB">
-  <!ENTITY dbus-python-buildsize     "4.7 MB (with tests)" >
-  <!ENTITY dbus-python-time          "less than 0.1 SBU (with tests)">
-  <!ENTITY dbus-python-egg-info      "&python3-site;/dbus_python-&dbus-python-version;.egg-info">
-]>
-
-  <!-- Begin D-Bus Python -->
-  <sect2 id="dbus-python" xreflabel="D-Bus Python-&dbus-python-version;">
-    <title>D-Bus Python-&dbus-python-version;</title>
-
-    <indexterm zone="dbus-python">
-      <primary sortas="a-dbus-python">dbus-python</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to D-Bus Python Module</title>
-
-      <para>
-        <application>D-Bus Python</application> provides
-        <application>Python</application> bindings to the
-        <application>D-Bus</application> API interface.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&dbus-python-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&dbus-python-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &dbus-python-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &dbus-python-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &dbus-python-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &dbus-python-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">D-Bus Python Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="dbus"/> and
-        <xref linkend="glib2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="pygobject3"/> and
-        <ulink url="https://pypi.python.org/pypi/tap.py/">tap.py</ulink>
-        (required for some tests)
-      </para>
-
-      <bridgehead renderas="sect5">
-       Optional (Required to build the API and HTML Documentation)</bridgehead>
-      <para role="optional">
-        <xref linkend="docutils"/> and
-        <ulink url="https://www.sphinx-doc.org/en/master/">Sphinx</ulink> with
-        <ulink url="https://github.com/rtfd/sphinx_rtd_theme">sphinx_rtd_theme</ulink>
-      </para>
-
-      <para condition="html" role="usernotes">User Notes:
-        <ulink url="&blfs-wiki;/dbus-python"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of D-Bus Python</title>
-
-      <para>
-        Build the D-Bus Python module by running the following  commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-      <para>
-        To test the results, issue: <command>ninja test</command>.
-      </para>
-
-      <para>
-        Now install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>ninja install &amp;&amp;
-cp -rv ../dbus_python.egg-info \
-   -T  &dbus-python-egg-info;</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-
-      <title>Command Explanations</title>
-
-      <para>
-        <command>cp -rv ... -T ...</command>: Install the metadata of this
-        Python module so <command>pip3</command> will be able to find this
-        module and use it as a dependency building and installing other
-        modules.  <parameter>-T</parameter> is used to make this command
-        behave properly in case that this module is reinstalled.
-      </para>
-
-    </sect3>
-
-    <sect3 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>
-            &python3-site;/dbus and &dbus-python-egg-info;
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/docutils.xml
===================================================================
--- general/prog/docutils.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY docutils-download-http "https://downloads.sourceforge.net/docutils/docutils-&docutils-version;.tar.gz">
-  <!ENTITY docutils-download-ftp  " ">
-  <!ENTITY docutils-md5sum        "0afa992a6e93db892107c3f087d0d9df">
-  <!ENTITY docutils-size          "2.0 MB">
-  <!ENTITY docutils-buildsize     "12 MB">
-  <!ENTITY docutils-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin docutils -->
-  <sect2 id="docutils" xreflabel="docutils-&docutils-version;">
-
-    <title>docutils-&docutils-version;</title>
-
-    <indexterm zone="docutils">
-      <primary sortas="a-docutils">docutils</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to docutils</title>
-
-      <para>
-        <application>docutils</application> is a set of
-        <application>Python</application> modules and programs
-        for processing plaintext docs into formats such as HTML, XML, or LaTeX.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&docutils-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&docutils-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &docutils-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &docutils-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &docutils-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &docutils-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-<!--
-      <bridgehead renderas="sect4">Docutils Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="python2"/>
-      </para>
--->
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/docutils"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of docutils</title>
-
-<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
-
-      <para>
-        To build the <application>Python 3</application> applications,
-        run the following command:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        To install the <application>Python</application> applications
-        run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user docutils &amp;&amp;
-
-for f in /usr/bin/rst*.py; do
-  ln -svf $(basename $f) /usr/bin/$(basename $f .py)
-done</userinput></screen>
-
-      <!-- FHS 3.0 section 4.4.2:
-           "There must be no subdirectories in /usr/bin."
-           But pip maintainers closed this as WONTFIX:
-           https://github.com/pypa/pip/issues/6906 -->
-      <para>
-        To reduce the time needed for loading Python scripts,
-        <command>pip3 install</command> will compile the scripts with
-        extension <filename class='extension'>.py</filename> into byte code
-        and save the result into
-        <filename class='extension'>.pyc</filename> files in the directory
-        <filename class='directory'>__pycache__</filename>.
-        But this package installs <filename class='extension'>.py</filename>
-        scripts into <filename class='directory'>/usr/bin</filename>.
-        So the byte code files for them will be installed into
-        <filename class='directory'>/usr/bin/__pycache__</filename>, which
-        is not allowed by FHS.  Still as the &root; user, remove this
-        directory:
-      </para>
-
-<screen role="root"><userinput>rm -rfv /usr/bin/__pycache__</userinput></screen>
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            rst2html4, rst2html5, rst2html, rst2latex, rst2man,
-            rst2odt_prepstyles, rst2odt, rst2pseudoxml, rst2s5,
-            rst2xetex, rst2xml, and rstpep2html
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/docutils{,-&docutils-version;.dist-info}
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/jinja2.xml
===================================================================
--- general/prog/jinja2.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
-  <!ENTITY Jinja2-download-ftp  " ">
-  <!ENTITY Jinja2-md5sum        "d31148abd89c1df1cdb077a55db27d02">
-  <!ENTITY Jinja2-size          "264 KB">
-  <!ENTITY Jinja2-buildsize     "1.9 MB">
-  <!ENTITY Jinja2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Jinja2 -->
-  <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;" revision="sysv">
-
-    <title>Jinja2-&Jinja2-version;</title>
-
-    <indexterm zone="Jinja2">
-      <primary sortas="a-Jinja2">Jinja2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Jinja2 Module</title>
-
-      <para>
-        <application>Jinja2</application> is a <application>Python</application>
-        module that implements a simple pythonic template language.
-      </para>
-
-      <note revision="systemd">
-        <para>
-          <application>Jinja2</application> was installed in LFS.
-          The instruction is only kept here for SysV revision.
-        </para>
-      </note>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Jinja2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Jinja2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Jinja2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Jinja2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Jinja2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Jinja2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Jinja2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="MarkupSafe"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/Jinja2"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Jinja2</title>
-      <para>
-        Build the module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        Install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Jinja2</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/Jinja2 and
-            /usr/lib/python&python3-majorver;/site-packages/Jinja2-&Jinja2-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/libxml2py2.xml
===================================================================
--- general/prog/libxml2py2.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!-- The download, md5sum, size entities need to match those used in libxml2.xml -->
-  <!ENTITY libxml2py2-download-http "https://download.gnome.org/sources/libxml2/2.10/libxml2-&libxml2-version;.tar.xz">
-  <!ENTITY libxml2py2-download-ftp  " ">
-  <!ENTITY libxml2py2-md5sum        "5ffd0cd047056d5699b3363c635582bc">
-  <!ENTITY libxml2py2-size          "2.5 MB">
-  <!ENTITY libxml2py2-buildsize     "49 MB (2.3 MB installed)">
-  <!ENTITY libxml2py2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin libxml2py2 -->
-  <sect2 id="libxml2py2" xreflabel="Python2 libxml2-&libxml2-version; module">
-
-    <title>libxml2-&libxml2-version; (for its Python2 module)</title>
-
-    <indexterm zone="libxml2py2">
-      <primary sortas="a-libxml2py2">libxml2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the libxml2 Python2 module</title>
-
-      <para>
-        These instructions provide the <application>Python2</application>
-        bindings for <application>libxml2</application>: the
-        <application>Python3</application> bindings are built as part of <xref
-        linkend="libxml2"/> and most packages in the book do not use these
-        bindings for the older <application>Python2</application>.
-      </para>
-
-      <para>
-        By building these bindings after <xref linkend="libxml2"/> has
-        been installed, there is no need to rebuild the time-consuming (if all
-        dependencies are used) main part of that package.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&libxml2py2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&libxml2py2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &libxml2py2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &libxml2py2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &libxml2py2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &libxml2py2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">libxml2 (Python2) Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxml2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/libxml2"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of libxml2 Python2 module</title>
-
-<!-- Editors note: Use \-\-root= instead of DESTDIR= when updating. -->
-
-      <para>
-        To build the <application>Python 2</application> module, run:
-      </para>
-
-<screen><userinput>./configure PYTHON=python2 &amp;&amp;
-cd python                  &amp;&amp;
-python2 setup.py build</userinput></screen>
-
-      <para>
-        To install the <application>Python 2</application> module,
-        as the
-        <systemitem class="username">root</systemitem> user run:
-      </para>
-
-<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            drv_libxml2.py, libxml2.py
-          </seg>
-          <seg>
-            libxml2mod.so
-          </seg>
-          <seg>
-            None
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="drv_libxml2.py2">
-        <term><command>drv_libxml2.py</command></term>
-        <listitem>
-          <para>
-            is a SAX <application>Python2</application> driver for libxml2
-          </para>
-          <indexterm zone="libxml2py2 drv_libxml2.py2">
-            <primary sortas="b-drv_libxml2.py2">drv_libxml2.py for Python2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxml2.py2">
-        <term><command>libxml2.py</command></term>
-        <listitem>
-          <para>
-            is the <application>Python2</application> binding for libxml2
-          </para>
-          <indexterm zone="libxml2py2 libxml2.py2">
-            <primary sortas="b-libxml2.py2">libxml2.py for Python2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libxml2mod2">
-        <term><filename class="libraryfile">libxml2mod.so</filename></term>
-        <listitem>
-          <para>
-            is the interface for <application>Python2</application>
-            to use <filename class="libraryfile">libxml2.so</filename>
-          </para>
-          <indexterm zone="libxml2py2 libxml2mod2">
-            <primary sortas="c-libxml2mod">libxml2mod.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/lxml.xml
===================================================================
--- general/prog/lxml.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
-  <!ENTITY lxml-download-ftp  " ">
-  <!ENTITY lxml-md5sum        "e27240a7319d80d0c1e5390ca31eb1d8">
-  <!ENTITY lxml-size          "3.2 MB">
-  <!ENTITY lxml-buildsize     "99 MB">
-  <!ENTITY lxml-time          "0.9 SBU">
-]>
-
-  <!-- Begin lxml -->
-  <sect2 id="lxml" xreflabel="lxml-&lxml-version;">
-
-    <title>lxml-&lxml-version;</title>
-
-    <indexterm zone="lxml">
-      <primary sortas="a-lxml">lxml</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to lxml Module</title>
-
-      <para>
-        <application>lxml</application> provides
-        <application>Python</application> bindings for
-        <xref linkend="libxslt"/> and <xref linkend="libxml2"/>.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&lxml-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&lxml-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &lxml-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &lxml-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &lxml-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &lxml-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">lxml Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="libxslt"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/lxml"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of lxml</title>
-
-      <para>
-        To build the <application>Python 3</application> module, run:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        To install the module, issue the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user lxml</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/lxml and
-            /usr/lib/python&python3-majorver;/site-packages/lxml-&lxml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/mako.xml
===================================================================
--- general/prog/mako.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY Mako-download-http "&pymodules-dl;/M/Mako/Mako-&mako-version;.tar.gz">
-  <!ENTITY Mako-download-ftp  " ">
-  <!ENTITY Mako-md5sum        "4fa0a489a247c59b36fe3e0de5514fed">
-  <!ENTITY Mako-size          "480 KB">
-  <!ENTITY Mako-buildsize     "3.1 MB">
-  <!ENTITY Mako-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin Mako -->
-  <sect2 id="Mako" xreflabel="Mako-&mako-version;">
-
-    <title>Mako-&mako-version;</title>
-
-    <indexterm zone="Mako">
-      <primary sortas="a-Mako">Mako</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Mako Module</title>
-
-      <para>
-        <application>Mako</application> is a <application>Python</application>
-        module that implements hyperfast and lightweight templating for the
-        <application>Python</application> platform.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&Mako-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&Mako-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &Mako-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &Mako-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &Mako-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &Mako-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4" revision="sysv">Mako Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5" revision="sysv">Required</bridgehead>
-      <para role="required" revision="sysv">
-        <xref linkend="MarkupSafe"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/Mako"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Mako</title>
-
-      <para>
-        Build the module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        Install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Mako</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            mako-render
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/mako and
-            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;.dist=info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/markupsafe.xml
===================================================================
--- general/prog/markupsafe.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,126 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY MarkupSafe-download-http "&pymodules-dl;/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
-  <!ENTITY MarkupSafe-download-ftp  " ">
-  <!ENTITY MarkupSafe-md5sum        "9809f9fdd98bc835b0c21aa8f79cbf30">
-  <!ENTITY MarkupSafe-size          "20 KB">
-  <!ENTITY MarkupSafe-buildsize     "360 KB">
-  <!ENTITY MarkupSafe-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin MarkupSafe -->
-  <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;" revision="sysv">
-
-    <title>MarkupSafe-&MarkupSafe-version;</title>
-
-    <indexterm zone="MarkupSafe">
-      <primary sortas="a-MarkupSafe">MarkupSafe</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to MarkupSafe Module</title>
-
-      <para>
-        <application>MarkupSafe</application> is a <application>Python</application>
-        module that implements a XML/HTML/XHTML Markup safe string.
-      </para>
-
-      <note revision="systemd">
-        <para>
-          <application>MarkupSafe</application> was installed in LFS.
-          The instruction is only kept here for SysV revision.
-        </para>
-      </note>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&MarkupSafe-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&MarkupSafe-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &MarkupSafe-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &MarkupSafe-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &MarkupSafe-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &MarkupSafe-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/MarkupSafe"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of MarkupSafe</title>
-
-      <para>
-        Install <application>MarkupSafe</application> with the following
-        commands:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        Then, as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user markupsafe</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/markupSafe and
-            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/py3c.xml
===================================================================
--- general/prog/py3c.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY py3c-download-http
-           "https://github.com/encukou/py3c/archive/v&py3c-version;/py3c-&py3c-version;.tar.gz">
-  <!ENTITY py3c-md5sum        "53029afde7e0cf8672a2d69d378a0cfc">
-  <!ENTITY py3c-size          "47 KB">
-  <!ENTITY py3c-buildsize     "608 KB">
-  <!ENTITY py3c-time          "less than 0.1 SBU">
-]>
-
-   <!-- Begin Py3c -->
-  <sect2 id="py3c" xreflabel="Py3c-&py3c-version;">
-
-    <title>Py3c-&py3c-version;</title>
-
-    <indexterm zone="py3c">
-      <primary sortas="a-Py3c">Py3c</primary>
-   </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Py3c</title>
-
-      <para>
-        <application>Py3c</application> helps you port C extensions to
-        Python 3. It provides a detailed guide, and a set of macros to
-        make porting easy and reduce boilerplate.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&py3c-download-http;"/>
-          </para>
-        </listitem>
-<!--
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&py3c-download-ftp;"/>
-          </para>
-        </listitem>
--->
-        <listitem>
-          <para>
-            Download MD5 sum: &py3c-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &py3c-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &py3c-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &py3c-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">Py3c Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
--->
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/py3c"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Py3c</title>
-
-      <para>
-        The <application>Py3c</application> package is a headers-only package
-        and because of that, no configuration and compilation is
-        required.
-      </para>
-
-      <para>
-        To test the package, issue:
-      </para>
-
-<screen remap="test"><userinput>make test-python3 &amp;&amp;
-make test-python3-cpp</userinput></screen>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<!-- Note:
-  Now, doing a DESTDIR install is just
-    "make prefix=/usr DESTDIR=<dest> install"
--->
-<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
-
-    </sect3>
-
-    <sect3 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/py3c
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/pyatspi2.xml
===================================================================
--- general/prog/pyatspi2.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pyatspi2-download-http
-           "&gnome-download-http;/pyatspi/2.38/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-download-ftp
-           "&gnome-download-ftp;/pyatspi/2.38/pyatspi-&pyatspi2-version;.tar.xz">
-  <!ENTITY pyatspi2-md5sum        "016c8bdcd950e11ad717043f4e91dedc">
-  <!ENTITY pyatspi2-size          "312 KB">
-  <!ENTITY pyatspi2-buildsize     "3.0 MB">
-  <!ENTITY pyatspi2-time          "less than 0.1 SBU">
-]>
-
-   <!-- Begin PyAtSpi2 -->
-  <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
-
-    <title>PyAtSpi2-&pyatspi2-version;</title>
-
-    <indexterm zone="pyatspi2">
-      <primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
-   </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyAtSpi2</title>
-
-      <para>
-        The <application>PyAtSpi2</application> package contains
-        <application>Python</application> bindings for the core
-        components of the <application>GNOME</application>
-        Accessibility.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyatspi2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyatspi2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyatspi2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyatspi2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyAtSpi2 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject3"/>
-      </para>
-
-      <bridgehead renderas="sect5">Recommended</bridgehead>
-      <para role="recommended">
-        <xref linkend="at-spi2-core"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pyatspi2"/>
-      </para>
-
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyAtSpi2</title>
-
-      <para>
-        To build <application>PyAtSpi2</application> as a
-        <application>Python 3</application> module, run the
-        following commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr --with-python=/usr/bin/python3</userinput></screen>
-
-      <para>
-        This package does not come with a testsuite.
-      </para>
-
-      <para>
-        To install the <application>Python 3</application> module,
-        run the following command as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-    </sect3>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/pyatspi
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/pycairo.xml
===================================================================
--- general/prog/pycairo.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pycairo-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo-version;/pycairo-&pycairo-version;.tar.gz">
-  <!ENTITY pycairo-download-ftp  " ">
-  <!ENTITY pycairo-md5sum        "682238eaa8bd7032e36a20b6f53824d1">
-  <!ENTITY pycairo-size          "336 KB">
-  <!ENTITY pycairo-buildsize     "2.9 MB">
-  <!ENTITY pycairo-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyCairo -->
-  <sect2 id="pycairo" xreflabel="PyCairo-&pycairo-version;">
-
-    <title>PyCairo-&pycairo-version;</title>
-
-    <indexterm zone="pycairo">
-      <primary sortas="a-PyCairo">PyCairo</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyCairo Module</title>
-
-      <para>
-        PyCairo provides <application>Python</application> bindings to
-        <application>Cairo</application>.
-      </para>
-
-      &lfs112_checked;
-      <!-- Does not use gcc -->
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycairo-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycairo-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycairo-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycairo-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycairo-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycairo-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cairo"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink> and
-        <ulink url="https://pypi.org/project/pytest/">pytest</ulink>
-        (for tests)
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pycairo"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCairo</title>
-
-      <note>
-        <para>
-           The current version of pycairo no longer builds the Python2 module.
-           If you need that module for packages such as <xref linkend="gimp"/>, use
-           <xref linkend="pycairo2"/>
-        </para>
-      </note>
-
-      <para>
-        Install <application>PyCairo</application> for Python3 by
-        running the following commands:
-      </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-
-<!--python3 setup.py build</userinput></screen>-->
-
-      <para>
-        To run the tests, this package requires the optional pytest module. If
-        it is installed, run the tests by running <command>ninja test</command>.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-
-<!--python3 setup.py install - -optimize=1   &amp;&amp;
-python3 setup.py install_pycairo_header &amp;&amp;
-python3 setup.py install_pkgconfig</userinput></screen>-->
-<!-- Seems that install does the following too
-python2 setup.py install_pycairo_header &amp;&amp;
-python2 setup.py install_pkgconfig</userinput></screen>-->
-
-<!-- Python2 is no longer supported
-python2 setup.py install - -optimize=1   &amp;&amp;
-python2 setup.py install_pycairo_header &amp;&amp;
-python2 setup.py install_pkgconfig      &amp;&amp;-->
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            <!--_cairo.so (python2) and -->
-            _cairo.&python3-lib-suffix;.so
-          </seg>
-          <seg>
-            /usr/include/pycairo,
-<!--            /usr/lib/python&python2-majorver;/site-packages/cairo,
-            /usr/lib/python&python2-majorver;/site-packages/pycairo-&pycairo-version;-py&python2-majorver;.egg,
-            /usr/lib/python&python3-majorver;/site-packages/cairo--> and
-            /usr/lib/python&python3-majorver;/site-packages/pycairo-&pycairo-version;-py&python3-majorver;.egg
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/pycairo2.xml
===================================================================
--- general/prog/pycairo2.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pycairo2-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo2-version;/pycairo-&pycairo2-version;.tar.gz">
-  <!ENTITY pycairo2-download-ftp  " ">
-  <!ENTITY pycairo2-md5sum        "be2ba51f234270dec340f28f1695a95e">
-  <!ENTITY pycairo2-size          "196 KB">
-  <!ENTITY pycairo2-buildsize     "2.3 MB">
-  <!ENTITY pycairo2-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyCairo -->
-  <sect2 id="pycairo2" xreflabel="PyCairo-&pycairo2-version;">
-
-    <title>PyCairo-&pycairo2-version;</title>
-
-    <indexterm zone="pycairo2">
-      <primary sortas="a-PyCairo2">PyCairo2</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyCairo for Python2 Module</title>
-
-      <para>
-        This version of
-        PyCairo provides <application>Python2</application> bindings to
-        <application>Cairo</application>.
-      </para>
-
-      &lfs112_checked;
-      <!-- Does not use gcc -->
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycairo2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycairo2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycairo2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycairo2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycairo2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycairo2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cairo"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink>
-          (for tests)
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pycairo"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCairo</title>
-
-      <note>
-        <para>
-           This version of PyCairo is only retained for packages such as <xref
-           linkend="gimp"/> which is stuck on Python2 until Gimp-3 is released.
-        </para>
-      </note>
-
-      <para>
-        Install <application>PyCairo</application> for Python2 by
-        running the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build</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>python2 setup.py install --optimize=1   &amp;&amp;
-python2 setup.py install_pycairo_header &amp;&amp;
-python2 setup.py install_pkgconfig</userinput></screen>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Program</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-          </seg>
-          <seg>
-            <!--_cairo.so (python2) and -->
-            _cairo.so
-          </seg>
-          <seg>
-            /usr/include/pycairo,
-            /usr/lib/python&python2-majorver;/site-packages/cairo,
-            /usr/lib/python&python2-majorver;/site-packages/pycairo-&pycairo2-version;-py&python2-majorver;.egg,
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/pycryptodome.xml
===================================================================
--- general/prog/pycryptodome.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pycryptodome-download-http "https://github.com/Legrandin/pycryptodome/archive/v&pycryptodome-version;/pycryptodome-&pycryptodome-version;.tar.gz">
-  <!ENTITY pycryptodome-download-ftp  " ">
-  <!ENTITY pycryptodome-md5sum        "6b3d3639172861d5ecc03017dc70206c">
-  <!ENTITY pycryptodome-size          "16 MB">
-  <!ENTITY pycryptodome-buildsize     "53 MB">
-  <!ENTITY pycryptodome-time          "0.1 SBU">
-]>
-
-  <!-- Begin pycryptodome -->
-  <sect2 id="pycryptodome" xreflabel="PyCryptodome-&pycryptodome-version;">
-
-    <title>PyCryptodome-&pycryptodome-version;</title>
-
-    <indexterm zone="pycryptodome">
-      <primary sortas="a-pycryptodome">pycryptodome</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to the PyCryptodome Module</title>
-
-      <para>
-        <application>PyCryptodome</application> is a collection of both secure
-        hash functions (such as SHA256 and RIPEMD160), and various encryption
-        algorithms (AES, DES, RSA, ElGamal, etc.), and is a drop-in replacement
-        for PyCrypto.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pycryptodome-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pycryptodome-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pycryptodome-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pycryptodome-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pycryptodome-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pycryptodome-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pycryptodome"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyCryptodome</title>
-
-      <para>
-        To build <application>PyCryptodome</application> as a Python 3
-        module, run the following command:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        To install the module, run the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user pycryptodome</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/pycryptodome-&pycryptodome-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/pygments.xml
===================================================================
--- general/prog/pygments.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pygments-download-http
-           "https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-&pygments-version;.tar.gz">
-  <!ENTITY pygments-download-ftp " ">
-  <!ENTITY pygments-md5sum        "6ccae578d28d18968b30a4711652fd9a">
-  <!ENTITY pygments-size          "4.1 MB">
-  <!ENTITY pygments-buildsize     "49 MB">
-  <!ENTITY pygments-time          "less than 0.1 SBU">
-]>
-
- <!-- Begin Pygments -->
-  <sect2 id="pygments" xreflabel="Pygments-&pygments-version;">
-
-    <title>Pygments-&pygments-version;</title>
-
-    <indexterm zone="pygments">
-      <primary sortas="a-Pygments">Pygments</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Pygments Module</title>
-
-      <para>
-        <application>Pygments</application> is a general syntax highlighter
-        written in <application>Python</application>, for more than 300
-        languages.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygments-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygments-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygments-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygments-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygments-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygments-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pygments"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Pygments</title>
-
-      <para>
-        Build the <application>Python 3</application> module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        To install the package run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Pygments</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            pygmentize
-           </seg>
-          <seg>
-            None
-           </seg>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/pygments amd
-            /usr/lib/python&python3-majorver;/site-packages/Pygments-&pygments-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/pygobject2.xml
===================================================================
--- general/prog/pygobject2.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pygobject2-download-http
-           "&gnome-download-http;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
-  <!ENTITY pygobject2-download-ftp
-           "&gnome-download-ftp;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
-  <!ENTITY pygobject2-md5sum        "ae48b60c690c4aa894e69e0c97802745">
-  <!ENTITY pygobject2-size          "728 KB">
-  <!ENTITY pygobject2-buildsize     "17 MB">
-  <!ENTITY pygobject2-time          "0.1 SBU">
-]>
-
-   <!-- Begin PyGObject2 -->
-  <sect2 id="pygobject2" xreflabel="PyGObject-&pygobject2-version;">
-
-    <title>PyGObject-&pygobject2-version;</title>
-
-    <indexterm zone="pygobject2">
-      <primary sortas="a-PyGObject">PyGObject</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGObject Module</title>
-
-      <para>
-        PyGObject-&pygobject2-version; provides
-        <application>Python 2</application> bindings to the GObject class from
-        <application>GLib</application>.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygobject2-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygobject2-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygobject2-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygobject2-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygobject2-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygobject2-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-    <bridgehead renderas="sect4">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/pygobject-&pygobject2-version;-fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
--->
-      <bridgehead renderas="sect4">PyGObject Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="glib2"/>,
-        <xref linkend="pycairo2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="gobject-introspection"/> and
-        <xref linkend="libxslt"/> (to Build Documentation)
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pygobject2"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGObject</title>
-
-      <para>
-        Install <application>PyGObject</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr --disable-introspection &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        This package does not have a working testsuite.
-      </para>
-
-      <para>
-        Now, as the <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <option>--disable-introspection</option>: Omit this switch if you have
-        installed <xref linkend="gobject-introspection"/>. Note that it
-        conflicts with <xref linkend="pygobject3"/>.
-      </para>
-
-      <para>
-        <option>--disable-docs</option>: This option disables the rebuilding of
-        the html documentation if <xref linkend="libxslt"/> is installed.
-      </para>
-
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>pygobject-codegen-2.0</seg>
-          <seg>
-            libpyglib-2.0-python.so,
-            _gio.so,
-            unix.so,
-            _glib.so and
-            _gobject.so.
-          </seg>
-          <seg>
-            /usr/include/pygtk-2.0,
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
-            /usr/share/gtk-doc/html/pygobject and
-            /usr/share/pygobject/2.0
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
Index: general/prog/pygobject3.xml
===================================================================
--- general/prog/pygobject3.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pygobject3-download-http
-           "&gnome-download-http;/pygobject/&gnome-minor-42;/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-download-ftp
-           "&gnome-download-ftp;/pygobject/&gnome-minor-42;/pygobject-&pygobject3-version;.tar.xz">
-  <!ENTITY pygobject3-md5sum        "c5b31bb58156661c0954f1dbfc950fc9">
-  <!ENTITY pygobject3-size          "548 KB">
-  <!ENTITY pygobject3-buildsize     "14 MB">
-  <!ENTITY pygobject3-time          "0.1 SBU">
-]>
-
- <!-- Begin PyGObject3 -->
-  <sect2 id="pygobject3" xreflabel="PyGObject-&pygobject3-version;">
-
-    <title>PyGObject-&pygobject3-version;</title>
-
-    <indexterm zone="pygobject3">
-      <primary sortas="a-PyGObject3">PyGObject3</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGObject3 Module</title>
-
-      <para>
-        <application>PyGObject3</application> provides
-        <application>Python</application> bindings to the GObject
-        class from <application>GLib</application>.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygobject3-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygobject3-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygobject3-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygobject3-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygobject3-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygobject3-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyGObject3 Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="gobject-introspection"/> and
-        <xref linkend="pycairo"/>
-          (<application>Python 3</application> module)
-      </para>
-
-      <bridgehead renderas="sect5">Optional (for the tests)</bridgehead>
-      <para role="optional">
-        <xref linkend="gtk4"/>,
-        <ulink url="https://pypi.python.org/pypi/pep8">pep8</ulink>,
-        <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
-        <ulink url="https://pypi.python.org/pypi/pytest">pytest</ulink>
-        <!-- pytest brings in a lot of dependencies - upwards of 10 -->
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pygobject3"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGObject3</title>
-
-    <para>
-      First, remove a faulty test:
-    </para>
-
-<screen><userinput remap="pre">mv -v tests/test_gdbus.py{,.nouse}</userinput></screen>
-
-    <para>
-      Install <application>pygobject3</application> by running the following
-      commands:
-    </para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
-ninja</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>ninja test</command>.
-      An already active graphical session with a bus address is necessary
-      to run the tests. <!--One test, <filename>tests/test_gdbus.py</filename>,
-      is known to fail.--> Another round of tests may report ERROR if
-      <xref linkend="gtk4" role="nodep"/> is not installed.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>ninja install</userinput></screen>
-
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-        href="../../xincludes/meson-buildtype-release.xml"/>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Library</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            None
-           </seg>
-          <seg>
-            <!--/usr/lib/python&python2-majorver;/site-packages/gi/_gi{,_cairo}.so and/or-->
-            /usr/lib/python&python3-majorver;/site-packages/gi/_gi{,_cairo}.&python3-lib-suffix;.so
-           </seg>
-          <seg>
-            /usr/include/pygobject-3.0 and
-             <!--/usr/lib/python&python2-majorver;/site-packages/{gi,pygtkcompat} and/or-->
-            /usr/lib/python&python3-majorver;/site-packages/{gi,pygtkcompat}
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/pygtk.xml
===================================================================
--- general/prog/pygtk.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pygtk-download-http
-           "&gnome-download-http;/pygtk/2.24/pygtk-&pygtk-version;.tar.bz2">
-  <!ENTITY pygtk-download-ftp
-           "&gnome-download-ftp;/pygtk/2.24/pygtk-&pygtk-version;.tar.bz2">
-  <!ENTITY pygtk-md5sum        "a1051d5794fd7696d3c1af6422d17a49">
-  <!ENTITY pygtk-size          "2.2 MB">
-  <!ENTITY pygtk-buildsize     "83 MB">
-  <!ENTITY pygtk-time          "0.7 SBU">
-]>
-
-   <!-- Begin PyGTK -->
-  <sect2 id="pygtk" xreflabel="PyGTK-&pygtk-version;">
-
-    <title>PyGTK-&pygtk-version;</title>
-
-    <indexterm zone="pygtk">
-      <primary sortas="a-PyGTK">PyGTK</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyGTK Module</title>
-
-      <para>
-        PyGTK lets you to easily create programs with a graphical user interface
-        using the <application>Python</application> programming language.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pygtk-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pygtk-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pygtk-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pygtk-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pygtk-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pygtk-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyGTK Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="pygobject2"/> and
-        <xref linkend="python2"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (atk module)</bridgehead>
-      <para role="required">
-        <xref linkend="atk"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (pango module)</bridgehead>
-      <para role="required">
-        <xref linkend="pango"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="pango"/>
-      </para>
-
-      <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="gtk2"/>.
-      </para>
-
-      <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
-      <para role="required">
-        <xref linkend="pycairo2"/> and
-        <xref linkend="libglade"/>.
-      </para>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <ulink url="https://www.numpy.org/">NumPy</ulink>
-      </para>
-
-      <bridgehead renderas="sect5">Optional (to Build Documentation)</bridgehead>
-      <para role="optional">
-        <xref linkend="libxslt"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pygtk"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyGTK</title>
-
-      <para>
-         First, adapt PyGTK to changes in Pango by removing undefined
-         APIs:
-      </para>
-
-<screen><userinput remap="pre">sed -i '1394,1402 d' pango.defs</userinput></screen>
-
-      <para>
-        Install <application>PyGTK</application> by running the following
-        commands:
-      </para>
-
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
-
-      <para>
-        The tests must be run from an active X display. If this is so, 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>
-    </sect3>
-
-    <sect3 role="commands">
-      <title>Command Explanations</title>
-
-      <para>
-        <parameter>--enable-docs</parameter>: This option enables rebuilding the
-        html documentation if <xref linkend="libxslt"/> is installed.
-      </para>
-    </sect3>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>pygtk-codegen-2.0 and pygtk-demo.</seg>
-          <seg>
-            atk.so,
-            _gtk.so,
-            glade.so,
-            gtkunixprint.so,
-            pango.so and
-            pangocairo.so.
-          </seg>
-          <seg>
-            /usr/include/pygtk-2.0,
-            /usr/lib/pygtk,
-            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0,
-            /usr/share/gtk-doc/html/pygtk and
-            /usr/share/pygtk.
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <variablelist>
-        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
-        <?dbfo list-presentation="list"?>
-        <?dbhtml list-presentation="table"?>
-
-        <varlistentry id="pygtk-codegen-2.0">
-          <term><command>pygtk-codegen-2.0</command></term>
-          <listitem>
-            <para>
-              is a wrapper script to run the <application>PyGTK</application>
-              codegen module
-            </para>
-            <indexterm zone="pygtk pygtk-codegen-2.0">
-              <primary sortas="b-pygtk-codegen-2.0">pygtk-codegen-2.0</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="pygtk-demo">
-          <term><command>pygtk-demo</command></term>
-          <listitem>
-            <para>
-              is a Python wrapper to run the <application>PyGTK</application>
-              demo program
-            </para>
-            <indexterm zone="pygtk pygtk-demo">
-              <primary sortas="b-pygtk-demo">pygtk-demo</primary>
-            </indexterm>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </sect3>
-
-  </sect2>
Index: general/prog/python-dbusmock.xml
===================================================================
--- general/prog/python-dbusmock.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY dbusmock-download-http "https://github.com/martinpitt/python-dbusmock/releases/download/&dbusmock-version;/python-dbusmock-&dbusmock-version;.tar.gz">
-  <!ENTITY dbusmock-download-ftp  " ">
-  <!ENTITY dbusmock-md5sum        "a4abf871eee51d5c1e0579da6caa2928">
-  <!ENTITY dbusmock-size          "88 KB">
-  <!ENTITY dbusmock-buildsize     "852 KB">
-  <!ENTITY dbusmock-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin dbusmock -->
-  <sect2 id="python-dbusmock" xreflabel="dbusmock-&dbusmock-version;">
-
-    <title>dbusmock-&dbusmock-version;</title>
-
-    <indexterm zone="python-dbusmock">
-      <primary sortas="a-dbusmock">dbusmock</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to dbusmock</title>
-
-      <para>
-        <application>dbusmock</application> is a Python library
-        useful for writing tests for software which talks to D-Bus services.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&dbusmock-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&dbusmock-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &dbusmock-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &dbusmock-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &dbusmock-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &dbusmock-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">dbusmock Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="dbus-python"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/dbusmock"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of dbusmock</title>
-
-      <para>
-        Build the package with:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        To install the package run the following as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user python-dbusmock</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/dbusmock and
-            /usr/lib/python&python3-majorver;/site-packages/python_dbusmock-&dbusmock-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/python-modules.xml
===================================================================
--- general/prog/python-modules.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ general/prog/python-modules.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -194,11 +194,11 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="asciidoc.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="cython.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="dbus-python.xml"/>
+    href="python-modules/asciidoc.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/cython.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/dbus-python.xml"/>
 
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -206,11 +206,11 @@
 -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="docutils.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="py3c.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyatspi2.xml"/>
+    href="python-modules/docutils.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/py3c.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pyatspi2.xml"/>
 <!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -218,29 +218,29 @@
 -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycairo.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycairo2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pycryptodome.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="python-dbusmock.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygments.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygobject2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygobject3.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pygtk.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyxdg.xml"/>
+    href="python-modules/pycairo.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pycairo2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pycryptodome.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/python-dbusmock.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pygments.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pygobject2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pygobject3.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pygtk.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/pyxdg.xml"/>
 
 <!--
@@ -256,17 +256,17 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="libxml2py2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="lxml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="markupsafe.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="jinja2.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="mako.xml"/>
+    href="python-modules/libxml2py2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/lxml.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/markupsafe.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/jinja2.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/mako.xml"/>
 
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -274,11 +274,11 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="pyyaml.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="scour.xml"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="six.xml"/>
+    href="python-modules/pyyaml.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/scour.xml"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="python-modules/six.xml"/>
 
 </sect1>
Index: general/prog/python-modules/asciidoc.xml
===================================================================
--- general/prog/python-modules/asciidoc.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/asciidoc.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 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 asciidoc-download-http "https://files.pythonhosted.org/packages/source/a/asciidoc/asciidoc-&asciidoc-version;.tar.gz">
+  <!ENTITY asciidoc-download-ftp  " ">
+  <!ENTITY asciidoc-md5sum        "ecac3af818f7a65596efc6e243b520a0">
+  <!ENTITY asciidoc-size          "212 KB">
+  <!ENTITY asciidoc-buildsize     "2.6 MB">
+  <!ENTITY asciidoc-time          "less than 0.1 SBU">
+]>
+
+<!-- Begin Py3c -->
+  <sect2 id="asciidoc" xreflabel="asciidoc-&asciidoc-version;">
+
+    <title>Asciidoc-&asciidoc-version;</title>
+
+    <indexterm zone="asciidoc">
+      <primary sortas="a-asciidoc">asciidoc</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Asciidoc Module</title>
+
+      <para>
+        The <application>Asciidoc</application> package is a text document
+        format for writing notes, documentation, articles, books, ebooks,
+        slideshows, web pages, man pages and blogs. AsciiDoc files can be
+        translated to many formats including HTML, PDF, EPUB, and man page.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&asciidoc-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&asciidoc-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &asciidoc-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &asciidoc-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &asciidoc-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &asciidoc-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Asciidoc Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Optional (runtime)</bridgehead>
+      <para role="optional">
+        <xref linkend="docbook-xsl"/>,
+        <xref linkend="fop"/>,
+        <xref linkend="libxslt"/>,
+        <xref linkend="lynx"/>,
+        <ulink url="https://sourceforge.net/projects/dblatex/">dblatex</ulink>, and
+        <ulink url="&w3m-url;">W3m</ulink>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Asciidoc</title>
+<!-- version 9.x is from blfs 11.0. We are now at 11.1
+      <para>
+        If you are upgrading from version 9.x, remove the previously installed
+        executables, as the <systemitem class="username">root</systemitem>
+        user:
+      </para>
+
+<screen role="root"><userinput>rm -rf /usr/bin/{asciidoc*,a2x*}</userinput></screen>
+-->
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user asciidoc</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            a2x and
+            asciidoc
+          </seg>
+          <seg>None</seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/asciidoc and
+            /usr/lib/python&python3-majorver;/site-packages/asciidoc-&asciidoc-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect5">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="a2x">
+          <term><command>a2x</command></term>
+          <listitem>
+            <para>
+              is a toolchain manager for AsciiDoc
+              (converts Asciidoc text files to other file formats)
+            </para>
+            <indexterm zone="asciidoc a2x">
+              <primary sortas="b-a2x">a2x</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="asciidoc-prog">
+          <term><command>asciidoc</command></term>
+          <listitem>
+            <para>
+              converts an AsciiDoc text file to HTML or DocBook
+            </para>
+            <indexterm zone="asciidoc asciidoc-prog">
+              <primary sortas="b-asciidoc-prog">asciidoc</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+      </variablelist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/cython.xml
===================================================================
--- general/prog/python-modules/cython.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/cython.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect2 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 cython-download-http "https://github.com/cython/cython/releases/download/&cython-version;/Cython-&cython-version;.tar.gz">
+  <!ENTITY cython-download-ftp  " ">
+  <!ENTITY cython-md5sum        "91c36ea86c00adcc5c1c11cf48b733c0">
+  <!ENTITY cython-size          "2.0 MB">
+  <!ENTITY cython-buildsize     "61 MB">
+  <!ENTITY cython-time          "0.5 SBU">
+]>
+
+<!-- Begin Py3c -->
+  <sect2 id="cython" xreflabel="cython-&cython-version;">
+
+    <title>Cython-&cython-version;</title>
+
+    <indexterm zone="cython">
+      <primary sortas="a-cython">cython</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Cython Module</title>
+
+      <para>
+        The <application>Cython</application> package provides a
+         compiler for writing C extensions for the Python language.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&cython-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&cython-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &cython-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &cython-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &cython-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &cython-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Cython</title>
+
+    <para> Build the module: </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>pip3 install --no-index --find-links dist --no-cache-dir --no-user Cython</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/Cython and
+            /usr/lib/python&python3-majorver;/site-packages/Cython-&cython-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/dbus-python.xml
===================================================================
--- general/prog/python-modules/dbus-python.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/dbus-python.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY dbus-python-download-http "https://dbus.freedesktop.org/releases/dbus-python/dbus-python-&dbus-python-version;.tar.gz">
+  <!ENTITY dbus-python-download-ftp  " ">
+  <!ENTITY dbus-python-md5sum        "33be8a4a766e1c7c9a377b8f934ce21a">
+  <!ENTITY dbus-python-size          "592 KB">
+  <!ENTITY dbus-python-buildsize     "4.7 MB (with tests)" >
+  <!ENTITY dbus-python-time          "less than 0.1 SBU (with tests)">
+  <!ENTITY dbus-python-egg-info      "&python3-site;/dbus_python-&dbus-python-version;.egg-info">
+]>
+
+  <!-- Begin D-Bus Python -->
+  <sect2 id="dbus-python" xreflabel="D-Bus Python-&dbus-python-version;">
+    <title>D-Bus Python-&dbus-python-version;</title>
+
+    <indexterm zone="dbus-python">
+      <primary sortas="a-dbus-python">dbus-python</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to D-Bus Python Module</title>
+
+      <para>
+        <application>D-Bus Python</application> provides
+        <application>Python</application> bindings to the
+        <application>D-Bus</application> API interface.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&dbus-python-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&dbus-python-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &dbus-python-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &dbus-python-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &dbus-python-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &dbus-python-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">D-Bus Python Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="dbus"/> and
+        <xref linkend="glib2"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="pygobject3"/> and
+        <ulink url="https://pypi.python.org/pypi/tap.py/">tap.py</ulink>
+        (required for some tests)
+      </para>
+
+      <bridgehead renderas="sect5">
+       Optional (Required to build the API and HTML Documentation)</bridgehead>
+      <para role="optional">
+        <xref linkend="docutils"/> and
+        <ulink url="https://www.sphinx-doc.org/en/master/">Sphinx</ulink> with
+        <ulink url="https://github.com/rtfd/sphinx_rtd_theme">sphinx_rtd_theme</ulink>
+      </para>
+
+      <para condition="html" role="usernotes">User Notes:
+        <ulink url="&blfs-wiki;/dbus-python"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of D-Bus Python</title>
+
+      <para>
+        Build the D-Bus Python module by running the following  commands:
+      </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr --buildtype=release .. &amp;&amp;
+ninja</userinput></screen>
+
+      <para>
+        To test the results, issue: <command>ninja test</command>.
+      </para>
+
+      <para>
+        Now install the module as the &root; user:
+      </para>
+
+<screen role="root"><userinput>ninja install &amp;&amp;
+cp -rv ../dbus_python.egg-info \
+   -T  &dbus-python-egg-info;</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="commands">
+
+      <title>Command Explanations</title>
+
+      <para>
+        <command>cp -rv ... -T ...</command>: Install the metadata of this
+        Python module so <command>pip3</command> will be able to find this
+        module and use it as a dependency building and installing other
+        modules.  <parameter>-T</parameter> is used to make this command
+        behave properly in case that this module is reinstalled.
+      </para>
+
+    </sect3>
+
+    <sect3 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>
+            &python3-site;/dbus and &dbus-python-egg-info;
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/docutils.xml
===================================================================
--- general/prog/python-modules/docutils.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/docutils.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY docutils-download-http "https://downloads.sourceforge.net/docutils/docutils-&docutils-version;.tar.gz">
+  <!ENTITY docutils-download-ftp  " ">
+  <!ENTITY docutils-md5sum        "0afa992a6e93db892107c3f087d0d9df">
+  <!ENTITY docutils-size          "2.0 MB">
+  <!ENTITY docutils-buildsize     "12 MB">
+  <!ENTITY docutils-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin docutils -->
+  <sect2 id="docutils" xreflabel="docutils-&docutils-version;">
+
+    <title>docutils-&docutils-version;</title>
+
+    <indexterm zone="docutils">
+      <primary sortas="a-docutils">docutils</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to docutils</title>
+
+      <para>
+        <application>docutils</application> is a set of
+        <application>Python</application> modules and programs
+        for processing plaintext docs into formats such as HTML, XML, or LaTeX.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&docutils-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&docutils-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &docutils-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &docutils-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &docutils-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &docutils-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+<!--
+      <bridgehead renderas="sect4">Docutils Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="python2"/>
+      </para>
+-->
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/docutils"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of docutils</title>
+
+<!-- Editors note: Use - -root= instead of DESTDIR= when updating. -->
+
+      <para>
+        To build the <application>Python 3</application> applications,
+        run the following command:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        To install the <application>Python</application> applications
+        run the following as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user docutils &amp;&amp;
+
+for f in /usr/bin/rst*.py; do
+  ln -svf $(basename $f) /usr/bin/$(basename $f .py)
+done</userinput></screen>
+
+      <!-- FHS 3.0 section 4.4.2:
+           "There must be no subdirectories in /usr/bin."
+           But pip maintainers closed this as WONTFIX:
+           https://github.com/pypa/pip/issues/6906 -->
+      <para>
+        To reduce the time needed for loading Python scripts,
+        <command>pip3 install</command> will compile the scripts with
+        extension <filename class='extension'>.py</filename> into byte code
+        and save the result into
+        <filename class='extension'>.pyc</filename> files in the directory
+        <filename class='directory'>__pycache__</filename>.
+        But this package installs <filename class='extension'>.py</filename>
+        scripts into <filename class='directory'>/usr/bin</filename>.
+        So the byte code files for them will be installed into
+        <filename class='directory'>/usr/bin/__pycache__</filename>, which
+        is not allowed by FHS.  Still as the &root; user, remove this
+        directory:
+      </para>
+
+<screen role="root"><userinput>rm -rfv /usr/bin/__pycache__</userinput></screen>
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            rst2html4, rst2html5, rst2html, rst2latex, rst2man,
+            rst2odt_prepstyles, rst2odt, rst2pseudoxml, rst2s5,
+            rst2xetex, rst2xml, and rstpep2html
+          </seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/docutils{,-&docutils-version;.dist-info}
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/jinja2.xml
===================================================================
--- general/prog/python-modules/jinja2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/jinja2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY Jinja2-download-http "&pymodules-dl;/J/Jinja2/Jinja2-&Jinja2-version;.tar.gz">
+  <!ENTITY Jinja2-download-ftp  " ">
+  <!ENTITY Jinja2-md5sum        "d31148abd89c1df1cdb077a55db27d02">
+  <!ENTITY Jinja2-size          "264 KB">
+  <!ENTITY Jinja2-buildsize     "1.9 MB">
+  <!ENTITY Jinja2-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Jinja2 -->
+  <sect2 id="Jinja2" xreflabel="Jinja2-&Jinja2-version;" revision="sysv">
+
+    <title>Jinja2-&Jinja2-version;</title>
+
+    <indexterm zone="Jinja2">
+      <primary sortas="a-Jinja2">Jinja2</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Jinja2 Module</title>
+
+      <para>
+        <application>Jinja2</application> is a <application>Python</application>
+        module that implements a simple pythonic template language.
+      </para>
+
+      <note revision="systemd">
+        <para>
+          <application>Jinja2</application> was installed in LFS.
+          The instruction is only kept here for SysV revision.
+        </para>
+      </note>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&Jinja2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&Jinja2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &Jinja2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &Jinja2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &Jinja2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &Jinja2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Jinja2 Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="MarkupSafe"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/Jinja2"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Jinja2</title>
+      <para>
+        Build the module:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        Install the module as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Jinja2</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/Jinja2 and
+            /usr/lib/python&python3-majorver;/site-packages/Jinja2-&Jinja2-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/libxml2py2.xml
===================================================================
--- general/prog/python-modules/libxml2py2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/libxml2py2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!-- The download, md5sum, size entities need to match those used in libxml2.xml -->
+  <!ENTITY libxml2py2-download-http "https://download.gnome.org/sources/libxml2/2.10/libxml2-&libxml2-version;.tar.xz">
+  <!ENTITY libxml2py2-download-ftp  " ">
+  <!ENTITY libxml2py2-md5sum        "5ffd0cd047056d5699b3363c635582bc">
+  <!ENTITY libxml2py2-size          "2.5 MB">
+  <!ENTITY libxml2py2-buildsize     "49 MB (2.3 MB installed)">
+  <!ENTITY libxml2py2-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin libxml2py2 -->
+  <sect2 id="libxml2py2" xreflabel="Python2 libxml2-&libxml2-version; module">
+
+    <title>libxml2-&libxml2-version; (for its Python2 module)</title>
+
+    <indexterm zone="libxml2py2">
+      <primary sortas="a-libxml2py2">libxml2</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to the libxml2 Python2 module</title>
+
+      <para>
+        These instructions provide the <application>Python2</application>
+        bindings for <application>libxml2</application>: the
+        <application>Python3</application> bindings are built as part of <xref
+        linkend="libxml2"/> and most packages in the book do not use these
+        bindings for the older <application>Python2</application>.
+      </para>
+
+      <para>
+        By building these bindings after <xref linkend="libxml2"/> has
+        been installed, there is no need to rebuild the time-consuming (if all
+        dependencies are used) main part of that package.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&libxml2py2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&libxml2py2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &libxml2py2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &libxml2py2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &libxml2py2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &libxml2py2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">libxml2 (Python2) Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="libxml2"/> and
+        <xref linkend="python2"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/libxml2"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of libxml2 Python2 module</title>
+
+<!-- Editors note: Use \-\-root= instead of DESTDIR= when updating. -->
+
+      <para>
+        To build the <application>Python 2</application> module, run:
+      </para>
+
+<screen><userinput>./configure PYTHON=python2 &amp;&amp;
+cd python                  &amp;&amp;
+python2 setup.py build</userinput></screen>
+
+      <para>
+        To install the <application>Python 2</application> module,
+        as the
+        <systemitem class="username">root</systemitem> user run:
+      </para>
+
+<screen role="root"><userinput>python2 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            drv_libxml2.py, libxml2.py
+          </seg>
+          <seg>
+            libxml2mod.so
+          </seg>
+          <seg>
+            None
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="drv_libxml2.py2">
+        <term><command>drv_libxml2.py</command></term>
+        <listitem>
+          <para>
+            is a SAX <application>Python2</application> driver for libxml2
+          </para>
+          <indexterm zone="libxml2py2 drv_libxml2.py2">
+            <primary sortas="b-drv_libxml2.py2">drv_libxml2.py for Python2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxml2.py2">
+        <term><command>libxml2.py</command></term>
+        <listitem>
+          <para>
+            is the <application>Python2</application> binding for libxml2
+          </para>
+          <indexterm zone="libxml2py2 libxml2.py2">
+            <primary sortas="b-libxml2.py2">libxml2.py for Python2</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libxml2mod2">
+        <term><filename class="libraryfile">libxml2mod.so</filename></term>
+        <listitem>
+          <para>
+            is the interface for <application>Python2</application>
+            to use <filename class="libraryfile">libxml2.so</filename>
+          </para>
+          <indexterm zone="libxml2py2 libxml2mod2">
+            <primary sortas="c-libxml2mod">libxml2mod.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/lxml.xml
===================================================================
--- general/prog/python-modules/lxml.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/lxml.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY lxml-download-http "&pymodules-dl;/l/lxml/lxml-&lxml-version;.tar.gz">
+  <!ENTITY lxml-download-ftp  " ">
+  <!ENTITY lxml-md5sum        "e27240a7319d80d0c1e5390ca31eb1d8">
+  <!ENTITY lxml-size          "3.2 MB">
+  <!ENTITY lxml-buildsize     "99 MB">
+  <!ENTITY lxml-time          "0.9 SBU">
+]>
+
+  <!-- Begin lxml -->
+  <sect2 id="lxml" xreflabel="lxml-&lxml-version;">
+
+    <title>lxml-&lxml-version;</title>
+
+    <indexterm zone="lxml">
+      <primary sortas="a-lxml">lxml</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to lxml Module</title>
+
+      <para>
+        <application>lxml</application> provides
+        <application>Python</application> bindings for
+        <xref linkend="libxslt"/> and <xref linkend="libxml2"/>.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&lxml-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&lxml-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &lxml-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &lxml-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &lxml-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &lxml-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">lxml Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="libxslt"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/lxml"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of lxml</title>
+
+      <para>
+        To build the <application>Python 3</application> module, run:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        To install the module, issue the following command as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user lxml</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/lxml and
+            /usr/lib/python&python3-majorver;/site-packages/lxml-&lxml-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/mako.xml
===================================================================
--- general/prog/python-modules/mako.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/mako.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY Mako-download-http "&pymodules-dl;/M/Mako/Mako-&mako-version;.tar.gz">
+  <!ENTITY Mako-download-ftp  " ">
+  <!ENTITY Mako-md5sum        "4fa0a489a247c59b36fe3e0de5514fed">
+  <!ENTITY Mako-size          "480 KB">
+  <!ENTITY Mako-buildsize     "3.1 MB">
+  <!ENTITY Mako-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin Mako -->
+  <sect2 id="Mako" xreflabel="Mako-&mako-version;">
+
+    <title>Mako-&mako-version;</title>
+
+    <indexterm zone="Mako">
+      <primary sortas="a-Mako">Mako</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Mako Module</title>
+
+      <para>
+        <application>Mako</application> is a <application>Python</application>
+        module that implements hyperfast and lightweight templating for the
+        <application>Python</application> platform.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&Mako-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&Mako-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &Mako-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &Mako-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &Mako-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &Mako-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4" revision="sysv">Mako Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5" revision="sysv">Required</bridgehead>
+      <para role="required" revision="sysv">
+        <xref linkend="MarkupSafe"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/Mako"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Mako</title>
+
+      <para>
+        Build the module:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        Install the module as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Mako</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            mako-render
+          </seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/mako and
+            /usr/lib/python&python3-majorver;/site-packages/Mako-&mako-version;.dist=info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/markupsafe.xml
===================================================================
--- general/prog/python-modules/markupsafe.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/markupsafe.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY MarkupSafe-download-http "&pymodules-dl;/M/MarkupSafe/MarkupSafe-&MarkupSafe-version;.tar.gz">
+  <!ENTITY MarkupSafe-download-ftp  " ">
+  <!ENTITY MarkupSafe-md5sum        "9809f9fdd98bc835b0c21aa8f79cbf30">
+  <!ENTITY MarkupSafe-size          "20 KB">
+  <!ENTITY MarkupSafe-buildsize     "360 KB">
+  <!ENTITY MarkupSafe-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin MarkupSafe -->
+  <sect2 id="MarkupSafe" xreflabel="MarkupSafe-&MarkupSafe-version;" revision="sysv">
+
+    <title>MarkupSafe-&MarkupSafe-version;</title>
+
+    <indexterm zone="MarkupSafe">
+      <primary sortas="a-MarkupSafe">MarkupSafe</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to MarkupSafe Module</title>
+
+      <para>
+        <application>MarkupSafe</application> is a <application>Python</application>
+        module that implements a XML/HTML/XHTML Markup safe string.
+      </para>
+
+      <note revision="systemd">
+        <para>
+          <application>MarkupSafe</application> was installed in LFS.
+          The instruction is only kept here for SysV revision.
+        </para>
+      </note>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&MarkupSafe-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&MarkupSafe-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &MarkupSafe-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &MarkupSafe-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &MarkupSafe-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &MarkupSafe-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/MarkupSafe"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of MarkupSafe</title>
+
+      <para>
+        Install <application>MarkupSafe</application> with the following
+        commands:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        Then, as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user markupsafe</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/markupSafe and
+            /usr/lib/python&python3-majorver;/site-packages/MarkupSafe-&MarkupSafe-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/py3c.xml
===================================================================
--- general/prog/python-modules/py3c.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/py3c.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY py3c-download-http
+           "https://github.com/encukou/py3c/archive/v&py3c-version;/py3c-&py3c-version;.tar.gz">
+  <!ENTITY py3c-md5sum        "53029afde7e0cf8672a2d69d378a0cfc">
+  <!ENTITY py3c-size          "47 KB">
+  <!ENTITY py3c-buildsize     "608 KB">
+  <!ENTITY py3c-time          "less than 0.1 SBU">
+]>
+
+   <!-- Begin Py3c -->
+  <sect2 id="py3c" xreflabel="Py3c-&py3c-version;">
+
+    <title>Py3c-&py3c-version;</title>
+
+    <indexterm zone="py3c">
+      <primary sortas="a-Py3c">Py3c</primary>
+   </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Py3c</title>
+
+      <para>
+        <application>Py3c</application> helps you port C extensions to
+        Python 3. It provides a detailed guide, and a set of macros to
+        make porting easy and reduce boilerplate.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&py3c-download-http;"/>
+          </para>
+        </listitem>
+<!--
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&py3c-download-ftp;"/>
+          </para>
+        </listitem>
+-->
+        <listitem>
+          <para>
+            Download MD5 sum: &py3c-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &py3c-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &py3c-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &py3c-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+<!--
+      <bridgehead renderas="sect4">Py3c Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+-->
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/py3c"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Py3c</title>
+
+      <para>
+        The <application>Py3c</application> package is a headers-only package
+        and because of that, no configuration and compilation is
+        required.
+      </para>
+
+      <para>
+        To test the package, issue:
+      </para>
+
+<screen remap="test"><userinput>make test-python3 &amp;&amp;
+make test-python3-cpp</userinput></screen>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<!-- Note:
+  Now, doing a DESTDIR install is just
+    "make prefix=/usr DESTDIR=<dest> install"
+-->
+<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
+
+    </sect3>
+
+    <sect3 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/py3c
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pyatspi2.xml
===================================================================
--- general/prog/python-modules/pyatspi2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pyatspi2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pyatspi2-download-http
+           "&gnome-download-http;/pyatspi/2.38/pyatspi-&pyatspi2-version;.tar.xz">
+  <!ENTITY pyatspi2-download-ftp
+           "&gnome-download-ftp;/pyatspi/2.38/pyatspi-&pyatspi2-version;.tar.xz">
+  <!ENTITY pyatspi2-md5sum        "016c8bdcd950e11ad717043f4e91dedc">
+  <!ENTITY pyatspi2-size          "312 KB">
+  <!ENTITY pyatspi2-buildsize     "3.0 MB">
+  <!ENTITY pyatspi2-time          "less than 0.1 SBU">
+]>
+
+   <!-- Begin PyAtSpi2 -->
+  <sect2 id="pyatspi2" xreflabel="PyAtSpi2-&pyatspi2-version;">
+
+    <title>PyAtSpi2-&pyatspi2-version;</title>
+
+    <indexterm zone="pyatspi2">
+      <primary sortas="a-PyAtSpi2">PyAtSpi2</primary>
+   </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyAtSpi2</title>
+
+      <para>
+        The <application>PyAtSpi2</application> package contains
+        <application>Python</application> bindings for the core
+        components of the <application>GNOME</application>
+        Accessibility.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pyatspi2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyatspi2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyatspi2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyatspi2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyatspi2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyatspi2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyAtSpi2 Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="pygobject3"/>
+      </para>
+
+      <bridgehead renderas="sect5">Recommended</bridgehead>
+      <para role="recommended">
+        <xref linkend="at-spi2-core"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyatspi2"/>
+      </para>
+
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyAtSpi2</title>
+
+      <para>
+        To build <application>PyAtSpi2</application> as a
+        <application>Python 3</application> module, run the
+        following commands:
+      </para>
+
+<screen><userinput>./configure --prefix=/usr --with-python=/usr/bin/python3</userinput></screen>
+
+      <para>
+        This package does not come with a testsuite.
+      </para>
+
+      <para>
+        To install the <application>Python 3</application> module,
+        run the following command as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    </sect3>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/pyatspi
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pycairo.xml
===================================================================
--- general/prog/python-modules/pycairo.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pycairo.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pycairo-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo-version;/pycairo-&pycairo-version;.tar.gz">
+  <!ENTITY pycairo-download-ftp  " ">
+  <!ENTITY pycairo-md5sum        "682238eaa8bd7032e36a20b6f53824d1">
+  <!ENTITY pycairo-size          "336 KB">
+  <!ENTITY pycairo-buildsize     "2.9 MB">
+  <!ENTITY pycairo-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin PyCairo -->
+  <sect2 id="pycairo" xreflabel="PyCairo-&pycairo-version;">
+
+    <title>PyCairo-&pycairo-version;</title>
+
+    <indexterm zone="pycairo">
+      <primary sortas="a-PyCairo">PyCairo</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyCairo Module</title>
+
+      <para>
+        PyCairo provides <application>Python</application> bindings to
+        <application>Cairo</application>.
+      </para>
+
+      &lfs112_checked;
+      <!-- Does not use gcc -->
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pycairo-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pycairo-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pycairo-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pycairo-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pycairo-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pycairo-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="cairo"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink> and
+        <ulink url="https://pypi.org/project/pytest/">pytest</ulink>
+        (for tests)
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycairo"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyCairo</title>
+
+      <note>
+        <para>
+           The current version of pycairo no longer builds the Python2 module.
+           If you need that module for packages such as <xref linkend="gimp"/>, use
+           <xref linkend="pycairo2"/>
+        </para>
+      </note>
+
+      <para>
+        Install <application>PyCairo</application> for Python3 by
+        running the following commands:
+      </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr --buildtype=release .. &amp;&amp;
+ninja</userinput></screen>
+
+
+<!--python3 setup.py build</userinput></screen>-->
+
+      <para>
+        To run the tests, this package requires the optional pytest module. If
+        it is installed, run the tests by running <command>ninja test</command>.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+
+<!--python3 setup.py install - -optimize=1   &amp;&amp;
+python3 setup.py install_pycairo_header &amp;&amp;
+python3 setup.py install_pkgconfig</userinput></screen>-->
+<!-- Seems that install does the following too
+python2 setup.py install_pycairo_header &amp;&amp;
+python2 setup.py install_pkgconfig</userinput></screen>-->
+
+<!-- Python2 is no longer supported
+python2 setup.py install - -optimize=1   &amp;&amp;
+python2 setup.py install_pycairo_header &amp;&amp;
+python2 setup.py install_pkgconfig      &amp;&amp;-->
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Program</segtitle>
+        <segtitle>Installed Library</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            <!--_cairo.so (python2) and -->
+            _cairo.&python3-lib-suffix;.so
+          </seg>
+          <seg>
+            /usr/include/pycairo,
+<!--            /usr/lib/python&python2-majorver;/site-packages/cairo,
+            /usr/lib/python&python2-majorver;/site-packages/pycairo-&pycairo-version;-py&python2-majorver;.egg,
+            /usr/lib/python&python3-majorver;/site-packages/cairo--> and
+            /usr/lib/python&python3-majorver;/site-packages/pycairo-&pycairo-version;-py&python3-majorver;.egg
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pycairo2.xml
===================================================================
--- general/prog/python-modules/pycairo2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pycairo2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pycairo2-download-http "https://github.com/pygobject/pycairo/releases/download/v&pycairo2-version;/pycairo-&pycairo2-version;.tar.gz">
+  <!ENTITY pycairo2-download-ftp  " ">
+  <!ENTITY pycairo2-md5sum        "be2ba51f234270dec340f28f1695a95e">
+  <!ENTITY pycairo2-size          "196 KB">
+  <!ENTITY pycairo2-buildsize     "2.3 MB">
+  <!ENTITY pycairo2-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin PyCairo -->
+  <sect2 id="pycairo2" xreflabel="PyCairo-&pycairo2-version;">
+
+    <title>PyCairo-&pycairo2-version;</title>
+
+    <indexterm zone="pycairo2">
+      <primary sortas="a-PyCairo2">PyCairo2</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyCairo for Python2 Module</title>
+
+      <para>
+        This version of
+        PyCairo provides <application>Python2</application> bindings to
+        <application>Cairo</application>.
+      </para>
+
+      &lfs112_checked;
+      <!-- Does not use gcc -->
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pycairo2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pycairo2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pycairo2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pycairo2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pycairo2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pycairo2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyCairo Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="cairo"/> and
+        <xref linkend="python2"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <ulink url="https://hypothesis.readthedocs.io">Hypothesis</ulink>
+          (for tests)
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycairo"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyCairo</title>
+
+      <note>
+        <para>
+           This version of PyCairo is only retained for packages such as <xref
+           linkend="gimp"/> which is stuck on Python2 until Gimp-3 is released.
+        </para>
+      </note>
+
+      <para>
+        Install <application>PyCairo</application> for Python2 by
+        running the following commands:
+      </para>
+
+<screen><userinput>python2 setup.py build</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>python2 setup.py install --optimize=1   &amp;&amp;
+python2 setup.py install_pycairo_header &amp;&amp;
+python2 setup.py install_pkgconfig</userinput></screen>
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Program</segtitle>
+        <segtitle>Installed Library</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            <!--_cairo.so (python2) and -->
+            _cairo.so
+          </seg>
+          <seg>
+            /usr/include/pycairo,
+            /usr/lib/python&python2-majorver;/site-packages/cairo,
+            /usr/lib/python&python2-majorver;/site-packages/pycairo-&pycairo2-version;-py&python2-majorver;.egg,
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pycryptodome.xml
===================================================================
--- general/prog/python-modules/pycryptodome.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pycryptodome.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pycryptodome-download-http "https://github.com/Legrandin/pycryptodome/archive/v&pycryptodome-version;/pycryptodome-&pycryptodome-version;.tar.gz">
+  <!ENTITY pycryptodome-download-ftp  " ">
+  <!ENTITY pycryptodome-md5sum        "6b3d3639172861d5ecc03017dc70206c">
+  <!ENTITY pycryptodome-size          "16 MB">
+  <!ENTITY pycryptodome-buildsize     "53 MB">
+  <!ENTITY pycryptodome-time          "0.1 SBU">
+]>
+
+  <!-- Begin pycryptodome -->
+  <sect2 id="pycryptodome" xreflabel="PyCryptodome-&pycryptodome-version;">
+
+    <title>PyCryptodome-&pycryptodome-version;</title>
+
+    <indexterm zone="pycryptodome">
+      <primary sortas="a-pycryptodome">pycryptodome</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to the PyCryptodome Module</title>
+
+      <para>
+        <application>PyCryptodome</application> is a collection of both secure
+        hash functions (such as SHA256 and RIPEMD160), and various encryption
+        algorithms (AES, DES, RSA, ElGamal, etc.), and is a drop-in replacement
+        for PyCrypto.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pycryptodome-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pycryptodome-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pycryptodome-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pycryptodome-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pycryptodome-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pycryptodome-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pycryptodome"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyCryptodome</title>
+
+      <para>
+        To build <application>PyCryptodome</application> as a Python 3
+        module, run the following command:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        To install the module, run the following command as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user pycryptodome</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/pycryptodome-&pycryptodome-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pygments.xml
===================================================================
--- general/prog/python-modules/pygments.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pygments.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pygments-download-http
+           "https://files.pythonhosted.org/packages/source/P/Pygments/Pygments-&pygments-version;.tar.gz">
+  <!ENTITY pygments-download-ftp " ">
+  <!ENTITY pygments-md5sum        "6ccae578d28d18968b30a4711652fd9a">
+  <!ENTITY pygments-size          "4.1 MB">
+  <!ENTITY pygments-buildsize     "49 MB">
+  <!ENTITY pygments-time          "less than 0.1 SBU">
+]>
+
+ <!-- Begin Pygments -->
+  <sect2 id="pygments" xreflabel="Pygments-&pygments-version;">
+
+    <title>Pygments-&pygments-version;</title>
+
+    <indexterm zone="pygments">
+      <primary sortas="a-Pygments">Pygments</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Pygments Module</title>
+
+      <para>
+        <application>Pygments</application> is a general syntax highlighter
+        written in <application>Python</application>, for more than 300
+        languages.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pygments-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygments-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygments-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygments-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygments-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygments-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygments"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Pygments</title>
+
+      <para>
+        Build the <application>Python 3</application> module:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        To install the package run the following as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user Pygments</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Library</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            pygmentize
+           </seg>
+          <seg>
+            None
+           </seg>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/pygments amd
+            /usr/lib/python&python3-majorver;/site-packages/Pygments-&pygments-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pygobject2.xml
===================================================================
--- general/prog/python-modules/pygobject2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pygobject2.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pygobject2-download-http
+           "&gnome-download-http;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
+  <!ENTITY pygobject2-download-ftp
+           "&gnome-download-ftp;/pygobject/2.28/pygobject-&pygobject2-version;.tar.xz">
+  <!ENTITY pygobject2-md5sum        "ae48b60c690c4aa894e69e0c97802745">
+  <!ENTITY pygobject2-size          "728 KB">
+  <!ENTITY pygobject2-buildsize     "17 MB">
+  <!ENTITY pygobject2-time          "0.1 SBU">
+]>
+
+   <!-- Begin PyGObject2 -->
+  <sect2 id="pygobject2" xreflabel="PyGObject-&pygobject2-version;">
+
+    <title>PyGObject-&pygobject2-version;</title>
+
+    <indexterm zone="pygobject2">
+      <primary sortas="a-PyGObject">PyGObject</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyGObject Module</title>
+
+      <para>
+        PyGObject-&pygobject2-version; provides
+        <application>Python 2</application> bindings to the GObject class from
+        <application>GLib</application>.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pygobject2-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygobject2-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygobject2-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygobject2-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygobject2-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygobject2-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+<!--
+    <bridgehead renderas="sect4">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/pygobject-&pygobject2-version;-fixes-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+-->
+      <bridgehead renderas="sect4">PyGObject Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="glib2"/>,
+        <xref linkend="pycairo2"/> and
+        <xref linkend="python2"/>
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="gobject-introspection"/> and
+        <xref linkend="libxslt"/> (to Build Documentation)
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygobject2"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyGObject</title>
+
+      <para>
+        Install <application>PyGObject</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-introspection &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        This package does not have a working testsuite.
+      </para>
+
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para>
+        <option>--disable-introspection</option>: Omit this switch if you have
+        installed <xref linkend="gobject-introspection"/>. Note that it
+        conflicts with <xref linkend="pygobject3"/>.
+      </para>
+
+      <para>
+        <option>--disable-docs</option>: This option disables the rebuilding of
+        the html documentation if <xref linkend="libxslt"/> is installed.
+      </para>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>pygobject-codegen-2.0</seg>
+          <seg>
+            libpyglib-2.0-python.so,
+            _gio.so,
+            unix.so,
+            _glib.so and
+            _gobject.so.
+          </seg>
+          <seg>
+            /usr/include/pygtk-2.0,
+            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0/{gio,glib,gobject},
+            /usr/share/gtk-doc/html/pygobject and
+            /usr/share/pygobject/2.0
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pygobject3.xml
===================================================================
--- general/prog/python-modules/pygobject3.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pygobject3.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pygobject3-download-http
+           "&gnome-download-http;/pygobject/&gnome-minor-42;/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-download-ftp
+           "&gnome-download-ftp;/pygobject/&gnome-minor-42;/pygobject-&pygobject3-version;.tar.xz">
+  <!ENTITY pygobject3-md5sum        "c5b31bb58156661c0954f1dbfc950fc9">
+  <!ENTITY pygobject3-size          "548 KB">
+  <!ENTITY pygobject3-buildsize     "14 MB">
+  <!ENTITY pygobject3-time          "0.1 SBU">
+]>
+
+ <!-- Begin PyGObject3 -->
+  <sect2 id="pygobject3" xreflabel="PyGObject-&pygobject3-version;">
+
+    <title>PyGObject-&pygobject3-version;</title>
+
+    <indexterm zone="pygobject3">
+      <primary sortas="a-PyGObject3">PyGObject3</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyGObject3 Module</title>
+
+      <para>
+        <application>PyGObject3</application> provides
+        <application>Python</application> bindings to the GObject
+        class from <application>GLib</application>.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pygobject3-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygobject3-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygobject3-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygobject3-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygobject3-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygobject3-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyGObject3 Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="gobject-introspection"/> and
+        <xref linkend="pycairo"/>
+          (<application>Python 3</application> module)
+      </para>
+
+      <bridgehead renderas="sect5">Optional (for the tests)</bridgehead>
+      <para role="optional">
+        <xref linkend="gtk4"/>,
+        <ulink url="https://pypi.python.org/pypi/pep8">pep8</ulink>,
+        <ulink url="https://pypi.python.org/pypi/pyflakes">pyflakes</ulink>, and
+        <ulink url="https://pypi.python.org/pypi/pytest">pytest</ulink>
+        <!-- pytest brings in a lot of dependencies - upwards of 10 -->
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygobject3"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyGObject3</title>
+
+    <para>
+      First, remove a faulty test:
+    </para>
+
+<screen><userinput remap="pre">mv -v tests/test_gdbus.py{,.nouse}</userinput></screen>
+
+    <para>
+      Install <application>pygobject3</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+meson --prefix=/usr --buildtype=release .. &amp;&amp;
+ninja</userinput></screen>
+
+    <para>
+      To test the results, issue: <command>ninja test</command>.
+      An already active graphical session with a bus address is necessary
+      to run the tests. <!--One test, <filename>tests/test_gdbus.py</filename>,
+      is known to fail.--> Another round of tests may report ERROR if
+      <xref linkend="gtk4" role="nodep"/> is not installed.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>ninja install</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+        href="../../../xincludes/meson-buildtype-release.xml"/>
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Library</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+           </seg>
+          <seg>
+            <!--/usr/lib/python&python2-majorver;/site-packages/gi/_gi{,_cairo}.so and/or-->
+            /usr/lib/python&python3-majorver;/site-packages/gi/_gi{,_cairo}.&python3-lib-suffix;.so
+           </seg>
+          <seg>
+            /usr/include/pygobject-3.0 and
+             <!--/usr/lib/python&python2-majorver;/site-packages/{gi,pygtkcompat} and/or-->
+            /usr/lib/python&python3-majorver;/site-packages/{gi,pygtkcompat}
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pygtk.xml
===================================================================
--- general/prog/python-modules/pygtk.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pygtk.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pygtk-download-http
+           "&gnome-download-http;/pygtk/2.24/pygtk-&pygtk-version;.tar.bz2">
+  <!ENTITY pygtk-download-ftp
+           "&gnome-download-ftp;/pygtk/2.24/pygtk-&pygtk-version;.tar.bz2">
+  <!ENTITY pygtk-md5sum        "a1051d5794fd7696d3c1af6422d17a49">
+  <!ENTITY pygtk-size          "2.2 MB">
+  <!ENTITY pygtk-buildsize     "83 MB">
+  <!ENTITY pygtk-time          "0.7 SBU">
+]>
+
+   <!-- Begin PyGTK -->
+  <sect2 id="pygtk" xreflabel="PyGTK-&pygtk-version;">
+
+    <title>PyGTK-&pygtk-version;</title>
+
+    <indexterm zone="pygtk">
+      <primary sortas="a-PyGTK">PyGTK</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyGTK Module</title>
+
+      <para>
+        PyGTK lets you to easily create programs with a graphical user interface
+        using the <application>Python</application> programming language.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pygtk-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pygtk-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pygtk-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pygtk-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pygtk-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pygtk-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyGTK Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="pygobject2"/> and
+        <xref linkend="python2"/>
+      </para>
+
+      <bridgehead renderas="sect5">Required (atk module)</bridgehead>
+      <para role="required">
+        <xref linkend="atk"/>
+      </para>
+
+      <bridgehead renderas="sect5">Required (pango module)</bridgehead>
+      <para role="required">
+        <xref linkend="pango"/>
+      </para>
+
+      <bridgehead renderas="sect5">Required (pangocairo module)</bridgehead>
+      <para role="required">
+        <xref linkend="pycairo2"/> and
+        <xref linkend="pango"/>
+      </para>
+
+      <bridgehead renderas="sect5">Required (gtk and gtk.unixprint modules)</bridgehead>
+      <para role="required">
+        <xref linkend="pycairo2"/> and
+        <xref linkend="gtk2"/>.
+      </para>
+
+      <bridgehead renderas="sect5">Required (gtk.glade module)</bridgehead>
+      <para role="required">
+        <xref linkend="pycairo2"/> and
+        <xref linkend="libglade"/>.
+      </para>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <ulink url="https://www.numpy.org/">NumPy</ulink>
+      </para>
+
+      <bridgehead renderas="sect5">Optional (to Build Documentation)</bridgehead>
+      <para role="optional">
+        <xref linkend="libxslt"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pygtk"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyGTK</title>
+
+      <para>
+         First, adapt PyGTK to changes in Pango by removing undefined
+         APIs:
+      </para>
+
+<screen><userinput remap="pre">sed -i '1394,1402 d' pango.defs</userinput></screen>
+
+      <para>
+        Install <application>PyGTK</application> by running the following
+        commands:
+      </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+      <para>
+        The tests must be run from an active X display. If this is so, 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>
+    </sect3>
+
+    <sect3 role="commands">
+      <title>Command Explanations</title>
+
+      <para>
+        <parameter>--enable-docs</parameter>: This option enables rebuilding the
+        html documentation if <xref linkend="libxslt"/> is installed.
+      </para>
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>pygtk-codegen-2.0 and pygtk-demo.</seg>
+          <seg>
+            atk.so,
+            _gtk.so,
+            glade.so,
+            gtkunixprint.so,
+            pango.so and
+            pangocairo.so.
+          </seg>
+          <seg>
+            /usr/include/pygtk-2.0,
+            /usr/lib/pygtk,
+            /usr/lib/python&python2-majorver;/site-packages/gtk-2.0,
+            /usr/share/gtk-doc/html/pygtk and
+            /usr/share/pygtk.
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <variablelist>
+        <bridgehead renderas="sect4">Short Descriptions</bridgehead>
+        <?dbfo list-presentation="list"?>
+        <?dbhtml list-presentation="table"?>
+
+        <varlistentry id="pygtk-codegen-2.0">
+          <term><command>pygtk-codegen-2.0</command></term>
+          <listitem>
+            <para>
+              is a wrapper script to run the <application>PyGTK</application>
+              codegen module
+            </para>
+            <indexterm zone="pygtk pygtk-codegen-2.0">
+              <primary sortas="b-pygtk-codegen-2.0">pygtk-codegen-2.0</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="pygtk-demo">
+          <term><command>pygtk-demo</command></term>
+          <listitem>
+            <para>
+              is a Python wrapper to run the <application>PyGTK</application>
+              demo program
+            </para>
+            <indexterm zone="pygtk pygtk-demo">
+              <primary sortas="b-pygtk-demo">pygtk-demo</primary>
+            </indexterm>
+          </listitem>
+        </varlistentry>
+      </variablelist>
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/python-dbusmock.xml
===================================================================
--- general/prog/python-modules/python-dbusmock.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/python-dbusmock.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY dbusmock-download-http "https://github.com/martinpitt/python-dbusmock/releases/download/&dbusmock-version;/python-dbusmock-&dbusmock-version;.tar.gz">
+  <!ENTITY dbusmock-download-ftp  " ">
+  <!ENTITY dbusmock-md5sum        "a4abf871eee51d5c1e0579da6caa2928">
+  <!ENTITY dbusmock-size          "88 KB">
+  <!ENTITY dbusmock-buildsize     "852 KB">
+  <!ENTITY dbusmock-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin dbusmock -->
+  <sect2 id="python-dbusmock" xreflabel="dbusmock-&dbusmock-version;">
+
+    <title>dbusmock-&dbusmock-version;</title>
+
+    <indexterm zone="python-dbusmock">
+      <primary sortas="a-dbusmock">dbusmock</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to dbusmock</title>
+
+      <para>
+        <application>dbusmock</application> is a Python library
+        useful for writing tests for software which talks to D-Bus services.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&dbusmock-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&dbusmock-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &dbusmock-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &dbusmock-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &dbusmock-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &dbusmock-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">dbusmock Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="dbus-python"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/dbusmock"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of dbusmock</title>
+
+      <para>
+        Build the package with:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        To install the package run the following as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user python-dbusmock</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/dbusmock and
+            /usr/lib/python&python3-majorver;/site-packages/python_dbusmock-&dbusmock-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pyxdg.xml
===================================================================
--- general/prog/python-modules/pyxdg.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pyxdg.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY pyxdg-download-http
+           "https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-&pyxdg-version;.tar.gz">
+  <!ENTITY pyxdg-download-ftp  " ">
+  <!ENTITY pyxdg-md5sum        "d9a1d04fe60c956f5e3b9de3b4ef4722">
+  <!ENTITY pyxdg-size          "76 KB">
+  <!ENTITY pyxdg-buildsize     "808 KB">
+  <!ENTITY pyxdg-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin PyXDG -->
+  <sect2 id="pyxdg" xreflabel="PyXDG-&pyxdg-version;">
+
+    <title>PyXDG-&pyxdg-version;</title>
+
+    <indexterm zone="pyxdg">
+      <primary sortas="a-PyXDG">PyXDG</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyXDG Module</title>
+
+      <para>
+        <application>PyXDG</application> is a <application>Python</application>
+        library to access freedesktop.org standards.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&pyxdg-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&pyxdg-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &pyxdg-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &pyxdg-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &pyxdg-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &pyxdg-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+<!--
+      <bridgehead renderas="sect4">PyXDG Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Optional</bridgehead>
+      <para role="optional">
+        <xref linkend="python2"/>
+      </para>
+-->
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/pyxdg"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyXDG</title>
+
+      <para>
+        Build the module:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+       <para>
+         Install the module as the &root; user:
+       </para>
+
+<screen role='root'><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user pyxdg</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Directory</segtitle>
+
+        <seglistitem>
+          <seg>
+            /usr/lib/python&python3-majorver;/site-packages/xdg and
+            /usr/lib/python&python3-majorver;/site-packages/pyxdg-&pyxdg-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/pyyaml.xml
===================================================================
--- general/prog/python-modules/pyyaml.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/pyyaml.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY PyYAML-download-http "https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-&PyYAML-version;.tar.gz">
+  <!ENTITY PyYAML-download-ftp  " ">
+  <!ENTITY PyYAML-md5sum        "1d19c798f25e58e3e582f0f8c977dbb8">
+  <!ENTITY PyYAML-size          "124 KB">
+  <!ENTITY PyYAML-buildsize     "3.3 MB">
+  <!ENTITY PyYAML-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin PyYAML -->
+  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
+
+    <title>PyYAML-&PyYAML-version;</title>
+
+    <indexterm zone="PyYAML">
+      <primary sortas="a-PyYAML">PyYAML</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to PyYAML Module</title>
+
+      <para>
+        <application>PyYAML</application> is a <application>Python</application>
+        module that implements the next generation YAML parser and emitter.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &PyYAML-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &PyYAML-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &PyYAML-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &PyYAML-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="cython"/> and
+        <xref linkend="libyaml"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/PyYAML"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of PyYAML</title>
+
+      <para>
+        Build PyYAML with the following command:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        Now, install the module as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user PyYAML</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python2-majorver;/site-packages/yaml and
+            /usr/lib/python&python3-majorver;/site-packages/PyYAML-&yaml-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/scour.xml
===================================================================
--- general/prog/python-modules/scour.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/scour.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY scour-download-http "https://github.com/scour-project/scour/archive/v0.38.2/scour-&scour-version;.tar.gz">
+  <!ENTITY scour-download-ftp  " ">
+  <!ENTITY scour-md5sum        "ae30f52602802f8c7df3a32e1f72b325">
+  <!ENTITY scour-size          "100 KB">
+  <!ENTITY scour-buildsize     "1.3 MB">
+  <!ENTITY scour-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin scour -->
+  <sect2 id="scour" xreflabel="Scour-&scour-version;">
+
+    <title>Scour-&scour-version;</title>
+
+    <indexterm zone="scour">
+      <primary sortas="a-scour">scour</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Scour Module</title>
+
+      <para>
+        <application>Scour</application> is an SVG (Scalable Vector Graphics)
+        optimizer/cleaner that reduces their size by optimizing structure and
+        removing unnecessary data.
+      </para>
+
+      &lfs112_checked;
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&scour-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&scour-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &scour-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &scour-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &scour-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &scour-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+
+      <bridgehead renderas="sect4">Scour Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Required</bridgehead>
+      <para role="required">
+        <xref linkend="six"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/scour"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of scour</title>
+
+      <para>
+        Build the module:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+
+      <para>
+        To install the module, run the following command as the &root; user:
+      </para>
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user scour</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Libraries</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            scour
+          </seg>
+          <seg>
+            None
+          </seg>
+          <seg>
+            /usr/lib/python3.10/site-packages/scour and
+            /usr/lib/python3.10/site-packages/scour-&scour-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="scour-prog">
+        <term><command>scour</command></term>
+        <listitem>
+          <para>
+            is a program to optimize and clean SVG files
+          </para>
+          <indexterm zone="scour scour-prog">
+            <primary sortas="b-scour">scour</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    </sect3>
+
+  </sect2>
Index: general/prog/python-modules/six.xml
===================================================================
--- general/prog/python-modules/six.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
+++ general/prog/python-modules/six.xml	(revision 1ff0f0cd707781eb522330dcc7a05584fa07e5d5)
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+   <!ENTITY % general-entities SYSTEM "../../../general.ent">
+  %general-entities;
+
+  <!ENTITY six-download-http "&pymodules-dl;/s/six/six-&six-version;.tar.gz">
+  <!ENTITY six-download-ftp  " ">
+  <!ENTITY six-md5sum        "a7c927740e4964dd29b72cebfc1429bb">
+  <!ENTITY six-size          "36 KB">
+  <!ENTITY six-buildsize     "376 KB">
+  <!ENTITY six-time          "less than 0.1 SBU">
+]>
+
+  <!-- Begin six -->
+  <sect2 id="six" xreflabel="six-&six-version;">
+
+    <title>six-&six-version;</title>
+
+    <indexterm zone="six">
+      <primary sortas="a-six">six</primary>
+    </indexterm>
+
+    <sect3 role="package">
+      <title>Introduction to Six Module</title>
+
+      <para>
+        Six is a Python 2 to 3 compatibility library.
+      </para>
+
+      &lfs112_checked;
+      <!-- Does not use gcc -->
+
+      <bridgehead renderas="sect4">Package Information</bridgehead>
+      <itemizedlist spacing="compact">
+        <listitem>
+          <para>
+            Download (HTTP): <ulink url="&six-download-http;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download (FTP): <ulink url="&six-download-ftp;"/>
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download MD5 sum: &six-md5sum;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Download size: &six-size;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated disk space required: &six-buildsize;
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            Estimated build time: &six-time;
+          </para>
+        </listitem>
+      </itemizedlist>
+<!--
+      <bridgehead renderas="sect4">Six Dependencies</bridgehead>
+
+      <bridgehead renderas="sect5">Recommended Dependencies</bridgehead>
+      <para role="recommended">
+        <xref linkend="python2"/>
+      </para>
+-->
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/six"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of Six</title>
+<!--
+      <note>
+        <para>
+          Both <application>Python 2</application> and
+          <application>Python 3</application> modules can
+          be built and installed without any conflicts.
+        </para>
+      </note>
+
+      <para>
+        Install <application>six</application> for Python 2 and Python 3
+        by running the following commands:
+      </para>
+
+<screen><userinput>python2 setup.py build &amp;&amp;
+python3 setup.py build</userinput></screen>
+-->
+      <para>
+        Build the module:
+      </para>
+
+<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>python2 setup.py install - -optimize=1 &amp;&amp;
+python3 setup.py install - -optimize=1</userinput></screen>
+-->
+
+<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user six</userinput></screen>
+
+    </sect3>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../../xincludes/pip3-cmd-explain.xml"/>
+
+    <sect3 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/lib/python&python3-majorver;/site-packages/six-&six-version;.dist-info
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+    </sect3>
+
+  </sect2>
Index: general/prog/pyxdg.xml
===================================================================
--- general/prog/pyxdg.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY pyxdg-download-http
-           "https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-&pyxdg-version;.tar.gz">
-  <!ENTITY pyxdg-download-ftp  " ">
-  <!ENTITY pyxdg-md5sum        "d9a1d04fe60c956f5e3b9de3b4ef4722">
-  <!ENTITY pyxdg-size          "76 KB">
-  <!ENTITY pyxdg-buildsize     "808 KB">
-  <!ENTITY pyxdg-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyXDG -->
-  <sect2 id="pyxdg" xreflabel="PyXDG-&pyxdg-version;">
-
-    <title>PyXDG-&pyxdg-version;</title>
-
-    <indexterm zone="pyxdg">
-      <primary sortas="a-PyXDG">PyXDG</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyXDG Module</title>
-
-      <para>
-        <application>PyXDG</application> is a <application>Python</application>
-        library to access freedesktop.org standards.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&pyxdg-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&pyxdg-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &pyxdg-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &pyxdg-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &pyxdg-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &pyxdg-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">PyXDG Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Optional</bridgehead>
-      <para role="optional">
-        <xref linkend="python2"/>
-      </para>
--->
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/pyxdg"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyXDG</title>
-
-      <para>
-        Build the module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-       <para>
-         Install the module as the &root; user:
-       </para>
-
-<screen role='root'><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user pyxdg</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Directory</segtitle>
-
-        <seglistitem>
-          <seg>
-            /usr/lib/python&python3-majorver;/site-packages/xdg and
-            /usr/lib/python&python3-majorver;/site-packages/pyxdg-&pyxdg-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/pyyaml.xml
===================================================================
--- general/prog/pyyaml.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY PyYAML-download-http "https://files.pythonhosted.org/packages/source/P/PyYAML/PyYAML-&PyYAML-version;.tar.gz">
-  <!ENTITY PyYAML-download-ftp  " ">
-  <!ENTITY PyYAML-md5sum        "1d19c798f25e58e3e582f0f8c977dbb8">
-  <!ENTITY PyYAML-size          "124 KB">
-  <!ENTITY PyYAML-buildsize     "3.3 MB">
-  <!ENTITY PyYAML-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin PyYAML -->
-  <sect2 id="PyYAML" xreflabel="PyYAML-&PyYAML-version;">
-
-    <title>PyYAML-&PyYAML-version;</title>
-
-    <indexterm zone="PyYAML">
-      <primary sortas="a-PyYAML">PyYAML</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to PyYAML Module</title>
-
-      <para>
-        <application>PyYAML</application> is a <application>Python</application>
-        module that implements the next generation YAML parser and emitter.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&PyYAML-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&PyYAML-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &PyYAML-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &PyYAML-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &PyYAML-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &PyYAML-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">PyYAML Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="cython"/> and
-        <xref linkend="libyaml"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/PyYAML"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of PyYAML</title>
-
-      <para>
-        Build PyYAML with the following command:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        Now, install the module as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user PyYAML</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python2-majorver;/site-packages/yaml and
-            /usr/lib/python&python3-majorver;/site-packages/PyYAML-&yaml-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/scour.xml
===================================================================
--- general/prog/scour.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY scour-download-http "https://github.com/scour-project/scour/archive/v0.38.2/scour-&scour-version;.tar.gz">
-  <!ENTITY scour-download-ftp  " ">
-  <!ENTITY scour-md5sum        "ae30f52602802f8c7df3a32e1f72b325">
-  <!ENTITY scour-size          "100 KB">
-  <!ENTITY scour-buildsize     "1.3 MB">
-  <!ENTITY scour-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin scour -->
-  <sect2 id="scour" xreflabel="Scour-&scour-version;">
-
-    <title>Scour-&scour-version;</title>
-
-    <indexterm zone="scour">
-      <primary sortas="a-scour">scour</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Scour Module</title>
-
-      <para>
-        <application>Scour</application> is an SVG (Scalable Vector Graphics)
-        optimizer/cleaner that reduces their size by optimizing structure and
-        removing unnecessary data.
-      </para>
-
-      &lfs112_checked;
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&scour-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&scour-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &scour-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &scour-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &scour-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &scour-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-
-      <bridgehead renderas="sect4">Scour Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Required</bridgehead>
-      <para role="required">
-        <xref linkend="six"/>
-      </para>
-
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/scour"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of scour</title>
-
-      <para>
-        Build the module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
-
-      <para>
-        To install the module, run the following command as the &root; user:
-      </para>
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user scour</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 role="content">
-      <title>Contents</title>
-
-      <segmentedlist>
-        <segtitle>Installed Programs</segtitle>
-        <segtitle>Installed Libraries</segtitle>
-        <segtitle>Installed Directories</segtitle>
-
-        <seglistitem>
-          <seg>
-            scour
-          </seg>
-          <seg>
-            None
-          </seg>
-          <seg>
-            /usr/lib/python3.10/site-packages/scour and
-            /usr/lib/python3.10/site-packages/scour-&scour-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="scour-prog">
-        <term><command>scour</command></term>
-        <listitem>
-          <para>
-            is a program to optimize and clean SVG files
-          </para>
-          <indexterm zone="scour scour-prog">
-            <primary sortas="b-scour">scour</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    </sect3>
-
-  </sect2>
Index: general/prog/six.xml
===================================================================
--- general/prog/six.xml	(revision 87065037375dfda5d5176c3865960962f58b707c)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY six-download-http "&pymodules-dl;/s/six/six-&six-version;.tar.gz">
-  <!ENTITY six-download-ftp  " ">
-  <!ENTITY six-md5sum        "a7c927740e4964dd29b72cebfc1429bb">
-  <!ENTITY six-size          "36 KB">
-  <!ENTITY six-buildsize     "376 KB">
-  <!ENTITY six-time          "less than 0.1 SBU">
-]>
-
-  <!-- Begin six -->
-  <sect2 id="six" xreflabel="six-&six-version;">
-
-    <title>six-&six-version;</title>
-
-    <indexterm zone="six">
-      <primary sortas="a-six">six</primary>
-    </indexterm>
-
-    <sect3 role="package">
-      <title>Introduction to Six Module</title>
-
-      <para>
-        Six is a Python 2 to 3 compatibility library.
-      </para>
-
-      &lfs112_checked;
-      <!-- Does not use gcc -->
-
-      <bridgehead renderas="sect4">Package Information</bridgehead>
-      <itemizedlist spacing="compact">
-        <listitem>
-          <para>
-            Download (HTTP): <ulink url="&six-download-http;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download (FTP): <ulink url="&six-download-ftp;"/>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download MD5 sum: &six-md5sum;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Download size: &six-size;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated disk space required: &six-buildsize;
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            Estimated build time: &six-time;
-          </para>
-        </listitem>
-      </itemizedlist>
-<!--
-      <bridgehead renderas="sect4">Six Dependencies</bridgehead>
-
-      <bridgehead renderas="sect5">Recommended Dependencies</bridgehead>
-      <para role="recommended">
-        <xref linkend="python2"/>
-      </para>
--->
-      <para condition="html" role="usernotes">
-        User Notes: <ulink url="&blfs-wiki;/six"/>
-      </para>
-    </sect3>
-
-    <sect3 role="installation">
-      <title>Installation of Six</title>
-<!--
-      <note>
-        <para>
-          Both <application>Python 2</application> and
-          <application>Python 3</application> modules can
-          be built and installed without any conflicts.
-        </para>
-      </note>
-
-      <para>
-        Install <application>six</application> for Python 2 and Python 3
-        by running the following commands:
-      </para>
-
-<screen><userinput>python2 setup.py build &amp;&amp;
-python3 setup.py build</userinput></screen>
--->
-      <para>
-        Build the module:
-      </para>
-
-<screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</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>python2 setup.py install - -optimize=1 &amp;&amp;
-python3 setup.py install - -optimize=1</userinput></screen>
--->
-
-<screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user six</userinput></screen>
-
-    </sect3>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/pip3-cmd-explain.xml"/>
-
-    <sect3 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/lib/python&python3-majorver;/site-packages/six-&six-version;.dist-info
-          </seg>
-        </seglistitem>
-      </segmentedlist>
-    </sect3>
-
-  </sect2>
