Index: general/graphlib/graphlib.xml
===================================================================
--- general/graphlib/graphlib.xml	(revision 68dfef54d6f81f6b3c10668416cb6178ec230d65)
+++ general/graphlib/graphlib.xml	(revision 1eb083a4bacf53b10c164263132463eb4f56051f)
@@ -29,7 +29,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="graphite2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="harfbuzz.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ijs.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jasper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lcms2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libavif.xml"/>
@@ -48,5 +46,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="newt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opencv.xml"/>
-<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision 68dfef54d6f81f6b3c10668416cb6178ec230d65)
+++ 	(revision )
@@ -1,255 +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 lcms-download-http "&sourceforge-dl;/lcms/lcms-&lcms-version;.tar.gz">
-  <!ENTITY lcms-download-ftp  " ">
-  <!ENTITY lcms-md5sum        "8af94611baf20d9646c7c2c285859818">
-  <!ENTITY lcms-size          "927 KB">
-  <!ENTITY lcms-buildsize     "27 MB">
-  <!ENTITY lcms-time          "0.5 SBU">
-]>
-
-<sect1 id="lcms" xreflabel="Little CMS-&lcms-version;">
-  <?dbhtml filename="lcms.html"?>
-
-
-  <title>Little CMS-&lcms-version;</title>
-
-  <indexterm zone="lcms">
-    <primary sortas="a-little-cms">Little CMS</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Little CMS</title>
-
-    <para>
-      The <application>Little CMS</application> library is used by other
-      programs to provide color management facilities.
-    </para>
-
-    &lfs120_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&lcms-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&lcms-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &lcms-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &lcms-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &lcms-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &lcms-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/lcms-&lcms-version;-cve_2013_4276-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Little CMS Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="libtiff"/>,
-      <xref linkend="libjpeg"/>, and
-      <xref linkend="python2"/> (with
-      <xref linkend="swig"/> also)
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Little CMS</title>
-
-    <para>
-      Install <application>Little CMS</application> by running the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../lcms-&lcms-version;-cve_2013_4276-1.patch &amp;&amp;
-
-./configure --prefix=/usr --disable-static       &amp;&amp;
-make</userinput></screen>
-
-    <para>
-      To test the results, issue: <command>make check</command>.
-    </para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install &amp;&amp;
-install -v -m755 -d /usr/share/doc/lcms-&lcms-version; &amp;&amp;
-install -v -m644    README.1ST doc/* \
-                    /usr/share/doc/lcms-&lcms-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-    <para>
-      <option>--with-python</option>: Use this parameter if
-      <application>Python</application> and
-      <application>SWIG</application> are installed.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>icc2ps, icclink, icctrans, wtpt and
-        optionally, jpegicc, tiffdiff and tifficc</seg>
-        <seg>liblcms.so and the optional _lcms.so Python module</seg>
-        <seg>/usr/share/doc/lcms-&lcms-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="icc2ps">
-        <term><command>icc2ps</command></term>
-        <listitem>
-          <para>
-            generates PostScript CRD or CSA from ICC profiles
-          </para>
-          <indexterm zone="lcms icc2ps">
-            <primary sortas="b-icc2ps">icc2ps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icclink">
-        <term><command>icclink</command></term>
-        <listitem>
-          <para>
-            links two or more profiles into a single device link profile
-          </para>
-          <indexterm zone="lcms icclink">
-            <primary sortas="b-icclink">icclink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="icctrans">
-        <term><command>icctrans</command></term>
-        <listitem>
-          <para>
-            is a color space conversion calculator
-          </para>
-          <indexterm zone="lcms icctrans">
-            <primary sortas="b-icctrans">icctrans</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="jpegicc">
-        <term><command>jpegicc</command></term>
-        <listitem>
-          <para>
-            is an ICC profile applier for JPEG files
-          </para>
-          <indexterm zone="lcms jpegicc">
-            <primary sortas="b-jpegicc">jpegicc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tifficc">
-        <term><command>tifficc</command></term>
-        <listitem>
-          <para>
-            is an ICC profile applier for TIFF files
-          </para>
-          <indexterm zone="lcms tifficc">
-            <primary sortas="b-tifficc">tifficc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tiffdiff">
-        <term><command>tiffdiff</command></term>
-        <listitem>
-          <para>
-            is a TIFF compare utility
-          </para>
-          <indexterm zone="lcms tiffdiff">
-            <primary sortas="b-tiffdiff">tiffdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wtpt">
-        <term><command>wtpt</command></term>
-        <listitem>
-          <para>
-            shows media white of profiles, identifying black body locus
-          </para>
-          <indexterm zone="lcms wtpt">
-            <primary sortas="b-wtpt">wtpt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liblcms">
-        <term><filename class="libraryfile">liblcms.so</filename></term>
-        <listitem>
-          <para>
-            is used by the <application>lcms</application> programs as
-            well as other programs to provide color management facilities
-          </para>
-          <indexterm zone="lcms liblcms">
-            <primary sortas="c-liblcms">liblcms.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
