From 505c46cc4a07bb1820d1b8ac1e2b49d7eabc6f53 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 21 Aug 2017 20:22:19 +0000
Subject: [PATCH] Add six-1.10.0 as a runtime dependency for gtk-doc

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@19058 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genutils/gtk-doc.xml       |   5 +
 general/prog/python-modules.xml    |   8 ++
 general/prog/six.xml               | 143 +++++++++++++++++++++++++++++
 introduction/welcome/changelog.xml |   4 +
 packages.ent                       |   1 +
 5 files changed, 161 insertions(+)
 create mode 100644 general/prog/six.xml

diff --git a/general/genutils/gtk-doc.xml b/general/genutils/gtk-doc.xml
index c0d2dc849c..9f58f4b0e3 100644
--- a/general/genutils/gtk-doc.xml
+++ b/general/genutils/gtk-doc.xml
@@ -84,6 +84,11 @@
       <ulink url="https://pypi.python.org/pypi/six">six</ulink>(for some tests)
     </para>
 
+    <bridgehead renderas="sect4">Required (runtime)</bridgehead>
+    <para role="required runtime">
+        <xref linkend="six"/> 
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/gtk-doc"/></para>
 
diff --git a/general/prog/python-modules.xml b/general/prog/python-modules.xml
index 596375e1ab..3b24cf284e 100644
--- a/general/prog/python-modules.xml
+++ b/general/prog/python-modules.xml
@@ -120,6 +120,11 @@
           <xref linkend="scour"/>
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <xref linkend="six"/>
+        </para>
+      </listitem>
       <listitem revision="systemd">
         <para>
           <xref linkend="PyYAML"/>
@@ -184,4 +189,7 @@
   <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"/>
+
 </sect1>
diff --git a/general/prog/six.xml b/general/prog/six.xml
new file mode 100644
index 0000000000..e5a71d41e6
--- /dev/null
+++ b/general/prog/six.xml
@@ -0,0 +1,143 @@
+<?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 "https://pypi.io/packages/source/s/six/six-&six-version;.tar.gz">
+  <!ENTITY six-download-ftp  " ">
+  <!ENTITY six-md5sum        "fa40144507194130b2941965f124c5ac">
+  <!ENTITY six-size          "32 KB">
+  <!ENTITY six-buildsize     "356 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 and 3 compatibility library. 
+      </para>
+
+      &lfs81_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">Required Dependencies</bridgehead>
+      <para role="required">
+        <xref linkend="python2"/> and/or
+        <xref linkend="python3"/>
+      </para>
+
+      <para condition="html" role="usernotes">
+        User Notes: <ulink url="&blfs-wiki;/six"/>
+      </para>
+    </sect3>
+
+    <sect3 role="installation">
+      <title>Installation of six</title>
+
+      <para>
+        Install <application>six</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</userinput></screen>
+
+      <para>
+        Install <application>six</application> for Python3 by running 
+        the following commands:
+      </para>
+
+<screen><userinput>python3 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>python3 setup.py install --optimize=1</userinput></screen>
+
+    </sect3>
+
+    <sect3 role="content">
+      <title>Contents</title>
+
+      <segmentedlist>
+        <segtitle>Installed Programs</segtitle>
+        <segtitle>Installed Module</segtitle>
+        <segtitle>Installed Directories</segtitle>
+
+        <seglistitem>
+          <seg>
+            None
+          </seg>
+          <seg>
+            six.py
+          </seg>
+          <seg>
+            /usr/lib/python2.7/site-packages/six-1.10.0-py2.7.egg and/or
+            /usr/lib/python3.6/site-packages/six-1.10.0-py3.6.egg
+          </seg>
+        </seglistitem>
+      </segmentedlist>
+    </sect3>
+  </sect2>
+  <!-- End six -->
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index ea46f1f693..878a1db874 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,10 @@
     <listitem>
       <para>August 21st, 2017</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add six-1.10.0 as a runtime dependency
+          for gtk-doc.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Update to pango-1.40.10. Fixes
           <ulink url="&blfs-ticket-root;9627">#9627</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 6aeba41262..129c0660f5 100644
--- a/packages.ent
+++ b/packages.ent
@@ -408,6 +408,7 @@
 <!ENTITY pyxdg-version                "0.25">
 <!ENTITY PyYAML-version               "3.12">
 <!ENTITY scour-version                "0.36">
+<!ENTITY six-version                  "1.10.0">
 <!-- <!ENTITY setuptools-version           "30.2.0"> -->
 
 <!-- Part IV -->