Index: archive/nepomuk-core.xml
===================================================================
--- archive/nepomuk-core.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
+++ archive/nepomuk-core.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -0,0 +1,136 @@
+<?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 nepomuk-core-download-http "&kde-download-http;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
+  <!ENTITY nepomuk-core-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
+  <!ENTITY nepomuk-core-md5sum        "b73d88658f0405d5f705c469d2697a9a">
+  <!ENTITY nepomuk-core-size          "374 KB">
+  <!ENTITY nepomuk-core-buildsize     "41 MB">
+  <!ENTITY nepomuk-core-time          "1.9 SBU">
+]>
+
+<sect1 id="nepomuk-core" xreflabel="nepomuk-core-&kde-version;">
+  <?dbhtml filename="nepomuk-core.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Nepomuk-core-&kde-version;</title>
+
+  <indexterm zone="nepomuk-core">
+    <primary sortas="a-nepomuk-core">nepomuk-core</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Nepomuk-core</title>
+
+    <para>Nepomuk-core contains the Semantik Desktop core libraries. This
+    includes central services like file indexing, file system monitoring,
+    query, and of course storage, as well as the corresponding client
+    libraries.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&nepomuk-core-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&nepomuk-core-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &nepomuk-core-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &nepomuk-core-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &nepomuk-core-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &nepomuk-core-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Nepomuk-core Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="kdelibs"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+    <xref linkend="kfilemetadata"/>,
+    <xref linkend="baloo"/>,
+    <xref linkend="poppler"/>,
+    <xref linkend="taglib"/>,
+    <xref linkend="exiv2"/> and
+    <xref linkend="ffmpeg"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink> and
+    <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nepomuk-core"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Nepomuk-core</title>
+
+    <para>Install <application>nepomuk-core</application> by running the following
+    commands:</para>
+
+<!-- Nothing is installed in sysconfdir ... -->
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a working test suite.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>nepomuk-simplesource-rcgen, nepomuk2-rcgen, nepomukbackup,
+        nepomukcleaner, nepomukindexer, nepomukserver and
+        nepomukservicestub</seg>
+        <seg>libkdeinit4_nepomukserver.so, libnepomukcommon.so,
+        libnepomukcore.so and several in
+        &kde-dir;/lib/kde4</seg>
+        <seg>&kde-dir;/include/nepomuk2, &kde-dir;/include/Nepomuk2,
+        &kde-dir;/lib/cmake/NepomukCore and several in
+        &kde-dir;/share/apps</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: archive/nepomuk-widgets.xml
===================================================================
--- archive/nepomuk-widgets.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
+++ archive/nepomuk-widgets.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -0,0 +1,123 @@
+<?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 nepomuk-widgets-download-http "&kde-download-http;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
+  <!ENTITY nepomuk-widgets-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
+  <!ENTITY nepomuk-widgets-md5sum        "21f54a8a36dd7396239513190e31d4ef">
+  <!ENTITY nepomuk-widgets-size          "48 KB">
+  <!ENTITY nepomuk-widgets-buildsize     "3.8 MB">
+  <!ENTITY nepomuk-widgets-time          "0.2 SBU">
+]>
+
+<sect1 id="nepomuk-widgets" xreflabel="nepomuk-widgets-&kde-version;">
+  <?dbhtml filename="nepomuk-widgets.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Nepomuk-widgets-&kde-version;</title>
+
+  <indexterm zone="nepomuk-widgets">
+    <primary sortas="a-nepomuk-widgets">nepomuk-widgets</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to nepomuk-widgets</title>
+
+    <para>Nepomuk-widgets contains the widget library for the Nepomuk Semantik
+    Desktop.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&nepomuk-widgets-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&nepomuk-widgets-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &nepomuk-widgets-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &nepomuk-widgets-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &nepomuk-widgets-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &nepomuk-widgets-time;</para>
+      </listitem>
+    </itemizedlist>
+
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/nepomuk-widgets-&kde-version;-rpc_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+ -->
+
+    <bridgehead renderas="sect3">Nepomuk-widgets Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="nepomuk-core"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/nepomuk-widgets"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of nepomuk-widgets</title>
+
+    <para>Install <application>nepomuk-widgets</application> by running the following
+    commands:</para>
+
+<!-- Nothing is installed in sysconfdir ... -->
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue <command>make test</command>.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>none</seg>
+        <seg>libnepomukwidgets.so</seg>
+        <seg>&kde-dir;/include/nepomuk2 and
+        &kde-dir;/lib/cmake/NepomukWidgets</seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: archive/shrdesktopontologies.xml
===================================================================
--- archive/shrdesktopontologies.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
+++ archive/shrdesktopontologies.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -0,0 +1,112 @@
+<?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 shared-desktop-ontologies-download-http
+           "&sourceforge-repo;/oscaf/shared-desktop-ontologies-&shared-desktop-ontologies-version;.tar.bz2">
+  <!ENTITY shared-desktop-ontologies-download-ftp  " ">
+  <!ENTITY shared-desktop-ontologies-md5sum        "db75d155ac9b60e3d187e23544744acc">
+  <!ENTITY shared-desktop-ontologies-size          "3.8 MB">
+  <!ENTITY shared-desktop-ontologies-buildsize     "6.7 MB">
+  <!ENTITY shared-desktop-ontologies-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="shared-desktop-ontologies" xreflabel="shared-desktop-ontologies-&shared-desktop-ontologies-version;">
+  <?dbhtml filename="shared-desktop-ontologies.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Shared-desktop-ontologies-&shared-desktop-ontologies-version;</title>
+
+  <indexterm zone="shared-desktop-ontologies">
+    <primary sortas="a-shared-desktop-ontologies">shared-desktop-ontologies</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Shared-Desktop-Ontologies</title>
+
+    <para>The Shared desktop ontologies provide RDF vocabularies for the
+    Semantic Desktop. This includes basic ontologies like RDF and RDFS and all
+    the Nepomuk ontologies like NRL, NIE, and NFO, which are also maintained
+    and developed in this open-source project.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&shared-desktop-ontologies-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&shared-desktop-ontologies-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &shared-desktop-ontologies-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &shared-desktop-ontologies-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &shared-desktop-ontologies-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &shared-desktop-ontologies-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Shared-desktop-ontologies Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/shared-desktop-ontologies"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Shared-desktop-ontologies</title>
+
+    <para>Install <application>Shared-desktop-ontologies</application> by
+    running the following commands:</para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev ..</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>none</seg>
+        <seg>none</seg>
+        <seg>&kde-dir;/share/ontology and
+        &kde-dir;/share/cmake/SharedDesktopOntologies</seg>
+      </seglistitem>
+    </segmentedlist>
+  </sect2>
+
+</sect1>
Index: archive/soprano.xml
===================================================================
--- archive/soprano.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
+++ archive/soprano.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -0,0 +1,235 @@
+<?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 soprano-download-http "&sourceforge-repo;/soprano/soprano-&soprano-version;.tar.bz2">
+  <!ENTITY soprano-download-ftp  " ">
+  <!ENTITY soprano-md5sum        "91413e5783efeee0beb747ea4c5c9ef0">
+  <!ENTITY soprano-size          "1.9 MB">
+  <!ENTITY soprano-buildsize     "22 MB">
+  <!ENTITY soprano-time          "0.6 SBU">
+]>
+
+<sect1 id="soprano" xreflabel="Soprano-&soprano-version;">
+  <?dbhtml filename="soprano.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Soprano-&soprano-version;</title>
+
+  <indexterm zone="soprano">
+    <primary sortas="a-Soprano">Soprano</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Soprano</title>
+
+    <para>
+      <application>Soprano</application> (formally known as QRDF) is a
+      library which provides a nice Qt interface to RDF storage solutions.
+      It has a modular structure which allows to replace the actual RDF
+      storage  implementation used.
+    </para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&soprano-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&soprano-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &soprano-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &soprano-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &soprano-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &soprano-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/soprano-&soprano-version;-dbus-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Soprano Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="cmake"/>,
+      <xref linkend="qt4"/>, and
+      <xref linkend="redland"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="clucene"/>,
+      <xref linkend="dbus"/>,
+      <xref linkend="libiodbc"/> (required for the Virtuoso backend. Additionally,
+      <xref linkend="virtuoso"/> is required as a runtime dependency for this
+      backend.)
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="doxygen"/> (to build the documentation) and
+      <ulink url="http://www.openrdf.org/">Sesame2</ulink>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/soprano"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Soprano</title>
+
+    <para>Install <application>soprano</application> by running the following
+    commands:</para>
+
+<screen><userinput>patch -Np1 -i ../soprano-&soprano-version;-dbus-1.patch &amp;&amp;
+
+mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      .. &amp;&amp;
+make</userinput></screen>
+
+    <para>This package does not come with a working test suite.</para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+</sect2>
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
+
+    <para>
+      <option>-DSOPRANO_DISABLE_CLUCENE_INDEX=ON</option>: This switch disables
+      compilation of Clucene-based full-text index.
+    </para>
+
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuration of Soprano</title>
+
+    <para>
+      Create a directory where <application>Soprano</application> places some
+      runtime data as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>install -m755 -d /srv/soprano</userinput></screen>
+
+    <para>
+      The <command>sopranod</command> accepts some parameters. To configure
+      how the bootscript starts <command>sopranod</command>,
+      create a configuration file again as the 
+      <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>cat &gt; /etc/sysconfig/soprano &lt;&lt;EOF
+# Begin /etc/sysconfig/soprano
+
+SOPRANO_STORAGE="/srv/soprano"
+SOPRANO_BACKEND="virtuoso"                       # virtuoso, sesame2, redland
+#SOPRANO_OPTIONS="$SOPRANO_OPTIONS --port 4711"  # Default port is 5000
+
+# End /etc/sysconfig/soprano
+EOF</userinput></screen>
+
+<sect3 id="soprano-init">
+      <title>Boot Script</title>
+
+      <note>
+        <para>
+          It is not required to start the <application>Soprano</application>
+          server at boottime for <application>KDE</application>.
+          <application>KDE</application> will start
+          <application>Soprano</application> as needed.
+        </para>
+      </note>
+
+      <para>
+        In order to get <application>Soprano</application> started
+        automatically when the system is booted, install the
+        <filename>/etc/rc.d/init.d/soprano</filename> init script included
+        in the <xref linkend="bootscripts"/> package as the  
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+      <indexterm zone="soprano soprano-init">
+        <primary sortas="f-soprano">soprano</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-soprano</userinput></screen>
+
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          onto2vocabularyclass, sopranocmd, and sopranod
+        </seg>
+        <seg>
+          libsopranoclient.so, libsopranoindex.so, libsopranoserver.so, and libsoprano.so
+        </seg>
+        <seg>
+          /usr/include/soprano,
+          /usr/include/Soprano,
+          /usr/lib/soprano, and
+          /usr/share/soprano
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
Index: archive/virtuoso.xml
===================================================================
--- archive/virtuoso.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
+++ archive/virtuoso.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -0,0 +1,297 @@
+<?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 virtuoso-download-http "&sourceforge-repo;/virtuoso/virtuoso-opensource-&virtuoso-version;.tar.gz">
+  <!ENTITY virtuoso-download-ftp  " ">
+  <!ENTITY virtuoso-md5sum        "94ef4f93cad915f73bee547fe95db725">
+  <!ENTITY virtuoso-size          "113 MB">
+  <!ENTITY virtuoso-buildsize     "895 MB (additional 2 GB to run the test suite)">
+  <!ENTITY virtuoso-time          "3.3 SBU (additional 22 SBU to run the test suite)">
+]>
+
+<sect1 id="virtuoso" xreflabel="Virtuoso-&virtuoso-version;">
+  <?dbhtml filename="virtuoso.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Virtuoso-&virtuoso-version;</title>
+
+  <indexterm zone="virtuoso">
+    <primary sortas="a-Virtuoso">Virtuoso</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Virtuoso</title>
+
+    <para><application>Virtuoso</application> is a cross-platform server that
+    implements multiple server-side protocols as part of a single-server product
+    offering. There is one server product that offers WebDAV/HTTP, Application,
+    and Database-server functionality alongside Native XML Storage, Universal
+    Data-Access Middleware, Business Process Integration and a Web-Services
+    Platform.</para>
+
+    &lfs75_built;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&virtuoso-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&virtuoso-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &virtuoso-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &virtuoso-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &virtuoso-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &virtuoso-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Virtuoso Dependencies</bridgehead>
+<!-- No longer needed?
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="net-tools"/>
+    </para>
+-->
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+    <xref linkend="libiodbc"/>,
+    <xref linkend="libxml2"/>,
+    <xref linkend="openssl"/>, and
+    <xref linkend="openldap"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <xref linkend="imagemagick"/>,
+    <xref linkend="python2"/>, and
+    <xref linkend="mitkrb"/>
+    <!-- Currently broken
+    <xref linkend="php"/>
+    <xref linkend="ruby"/>
+    <ulink url="https://libwbxml.opensync.org/">libwbxml</ulink
+    -->
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/virtuoso"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Virtuoso</title>
+
+    <para>Install <application>virtuoso</application> by running the following
+    commands:</para>
+
+<screen><userinput>sed -i "s|virt_iodbc_dir/include|&amp;/iodbc|" configure  &amp;&amp;
+./configure --prefix=/usr                             \
+            --sysconfdir=/etc                         \
+            --localstatedir=/var                      \
+            --with-iodbc=/usr                         \
+            --with-readline                           \
+            --without-internal-zlib                   \
+            --program-transform-name="s/isql/isql-v/" \
+            --disable-all-vads                        \
+            --disable-static                          &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results, issue <command>make -k check</command>.
+    Some tests are known to fail.</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/virtuoso-&virtuoso-version; &amp;&amp;
+ln -s   -v          ../../virtuoso/doc \
+                    /usr/share/doc/virtuoso-&virtuoso-version;</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para><command>sed -i ...</command>: This command is used to modify the
+    <envar>CPPFLAGS</envar> variable so that the <application>libiodbc</application>
+    interface headers are found by the <command>configure</command> script.</para>
+
+    <para><parameter>--with-iodbc=/usr</parameter>: This parameter is used so
+    that the build will use the system <application>libiodbc</application> interface
+    headers and not the headers in the source tree.</para>
+
+    <para><parameter>--with-readline</parameter>: This parameter is used so that
+    the system <application>Readline</application> library is used.</para>
+
+    <para><parameter>--without-internal-zlib</parameter>: This parameter is set
+    so that the installed <application>zlib</application> library is used and
+    not the bundled one.</para>
+
+    <para><parameter>--program-transform-name</parameter>: Both
+    <application>Virtuoso</application> and <application>unixODBC</application>
+    install a program named <command>isql</command>. Use this parameter to rename
+    <application>virtuoso</application>s program to <command>isql-v</command>.</para>
+
+    <para><parameter>--disable-all-vads</parameter>: This parameter disables
+    building all the VAD packages (tutorials, demos, etc.).</para>
+
+    <para><parameter>--disable-static</parameter>: This option disables building
+    static libraries. However, the main <application>Virtuoso</application>
+    libraries, <filename class="libraryfile">libvirtuoso-t</filename> and
+    <filename class="libraryfile">libvirtuoso-iodbc-t</filename> are still
+    built as static libraries.</para>
+
+    <para><option>--enable-python</option>: Add this option if
+    <application>Python</application> is installed to enable building
+    <application>Python</application> bindings.</para>
+
+<!-- broken with JDK-version7
+    <para><option>-&#45;with-jdk4</option>: Add this option to specify the path
+    to the <xref linkend="jdk"/> and to enable making use of Java.</para>
+-->
+
+    <para><option>--with-port</option>: Add this if you want the
+    <application>Virtuoso</application> server to listen on a port other than
+    1111.</para>
+
+    <para><option>--enable-aio</option>: Add this if you want
+    <application>Virtuoso</application> to perform asynchronous file I/O
+    operations instead of synchronous file I/O.</para>
+
+    <para><option>--enable-perl</option>: Do not use this option if you built
+    Perl according to the LFS instructions. The build will fail with a note
+    similar to <computeroutput>Your perl should be compiled w -Dusemultiplicity.
+    Check the output of perl -V:usemultiplicity</computeroutput>.</para>
+
+    <para>Note that passing the <option>with-jdk4=${JAVA_HOME}</option>,
+    <option>--enable-php5=/usr</option>, <option>--enable-ruby</option>, and
+    <option>--enable-wbxml2=/usr</option> options all will fail during the
+    <command>configure</command> phase of the build. They will not break
+    the build, but the desired support will not be included in the build.</para>
+  </sect2>
+
+  <sect2 role="configuration">
+    <title>Configuration</title>
+
+    <note><para>If <application>Virtuoso</application> is only to be used
+    for <application>KDE</application>, there is no need to start the
+    <application>Virtuoso</application> server at boot time.</para></note>
+
+    <sect3 id="virtuoso-init">
+      <title>Boot Script</title>
+
+      <para>If you want the <application>Virtuoso</application> server to
+      start automatically when the system is booted, install the
+      <filename>/etc/rc.d/init.d/virtuoso</filename> init script included
+      in the <xref linkend="bootscripts"/> package.</para>
+
+      <indexterm zone="virtuoso virtuoso-init">
+        <primary sortas="f-virtuoso">virtuoso</primary>
+      </indexterm>
+
+<screen role="root"><userinput>make install-virtuoso</userinput></screen>
+
+    </sect3>
+
+    <sect3 id="virtuoso-users">
+      <title>User accounts</title>
+
+      <para>When the server is started using the start script, there is a web
+      interface to <application>Virtuoso</application> at
+      <ulink url="http://localhost:8890/"/>. Several links are pointing to
+      the OpenLink site, but the <application>Conductor</application> at
+      <ulink url="http://localhost:8890/conductor/"/>. This is a full featured
+      configuration site for <application>Virtuoso</application>. Login as
+      <systemitem class="username">dba</systemitem> with the predefined
+      password <literal>dba</literal>.</para>
+
+      <warning>
+        <title>Change password</title>
+
+        <para>Remember to immediately change the password of user
+        <systemitem class="username">dba</systemitem> as well as of all other
+        predefined users. Click on <literal>[System Admin]</literal> and
+        than on <literal>[User Accounts]</literal>.</para>
+
+      </warning>
+    </sect3>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          inifile, isql-v, isql-v-iodbc, isql-vw, isql-vw-iodbc, odbc_mail,
+          virt_mail, virtuoso-iodbc-t, and virtuoso-t
+        </seg>
+        <seg>
+          libvirtuoso-iodbc-t.a, libvirtuoso-t.a, virtodbc.so, virtodbc_r.so,
+          virtodbcu.so, and virtodbcu_r.so
+        </seg>
+        <seg>
+          /usr/lib/hibernate,
+          /usr/lib/jdbc-2.0,
+          /usr/lib/jdbc-3.0,
+          /usr/lib/jdbc-4.0,
+          /usr/lib/jdbc-4.1,
+          /usr/lib/jena,
+          /usr/lib/jena2,
+          /usr/lib/sesame,
+          /usr/lib/virtuoso
+          /usr/share/doc/virtuoso-&virtuoso-version;,
+          /usr/share/virtuoso, and
+          /var/lib/virtuoso
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="isql-v">
+        <term><command>isql-v</command></term>
+        <listitem>
+          <para>is an interactive SQL utility.</para>
+          <indexterm zone="virtuoso isql-v">
+            <primary sortas="b-isql-v">isql-v</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="virtuoso-t">
+        <term><command>virtuoso-t</command></term>
+        <listitem>
+          <para>is the Universial Server daemon.</para>
+          <indexterm zone="virtuoso virtuoso-t">
+            <primary sortas="b-virtuoso-t">virtuoso-t</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general.ent
===================================================================
--- general.ent	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ general.ent	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -595,5 +595,5 @@
 <!-- Part VII -->
 <!-- Chapters 27-29 -->                           <!-- stable lt .90 micro version -->
-<!ENTITY kde-version                  "4.13.0">    <!-- applies to all kde packages -->
+<!ENTITY kde-version                  "4.13.1">    <!-- applies to all kde packages -->
 <!ENTITY kde-dldir                    "&kde-version;">
 <!ENTITY kde-download-http            "http://download.kde.org/stable/">
@@ -601,5 +601,5 @@
 <!ENTITY kde-dir-var                  "KDE_PREFIX">
 <!ENTITY kde-dir                      "$&kde-dir-var;">
-<!ENTITY kde-workspace-version        "4.11.8">
+<!ENTITY kde-workspace-version        "4.11.9">
 <!ENTITY automoc4-version             "0.9.88">
 <!ENTITY phonon-version               "4.7.1">
Index: general/sysutils/redland.xml
===================================================================
--- general/sysutils/redland.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ general/sysutils/redland.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -63,16 +63,16 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="rasqal"/>
+      <xref linkend="rasqal"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="db"/>,
-    <xref linkend="libiodbc"/>,
-    <xref linkend="sqlite"/>,
-    <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-    <xref linkend="postgresql"/>,
-    <xref linkend="virtuoso"/> and
-    <ulink url="http://sourceforge.net/projects/threestore/">3store</ulink>
+      <xref linkend="db"/>,
+      <xref linkend="libiodbc"/>,
+      <xref linkend="sqlite"/>,
+      <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
+      <xref linkend="postgresql"/>,
+      <ulink url="&sourceforge-repo;/virtuoso/">virtuoso</ulink>, and
+      <ulink url="http://sourceforge.net/projects/threestore/">3store</ulink>
     </para>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ introduction/welcome/changelog.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -48,4 +48,16 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to kde-4.13.1. Fixes
+          <ulink url="&blfs-ticket-root;5067">#5067</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Archive nepomuk-widgets, nepomuk-core,
+          shared-desktop-ontologies. virtuoso, and soprano.  Fixes
+          <ulink url="&blfs-ticket-root;4780">#4780</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add libkdcraw-4.13.1.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Add libraw-0.16.0.</para>
         </listitem>
Index: kde/add/add.xml
===================================================================
--- kde/add/add.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/add.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -25,4 +25,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kdeplasma-addons.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="okular.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libkdcraw.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gwenview.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="add-pkgs.xml"/>
Index: kde/add/ark.xml
===================================================================
--- kde/add/ark.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/ark.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY ark-download-http "&kde-download-http;&kde-version;/src/ark-&kde-version;.tar.xz">
   <!ENTITY ark-download-ftp  "&kde-download-ftp;&kde-version;/src/ark-&kde-version;.tar.xz">
-  <!ENTITY ark-md5sum        "bdc9077cca769bdf676c2892651aa17b">
-  <!ENTITY ark-size          "225 KB">
-  <!ENTITY ark-buildsize     "9.9 MB">
-  <!ENTITY ark-time          "0.4 SBU">
+  <!ENTITY ark-md5sum        "75bf068a1c6385b3b094eb56eb8998cb">
+  <!ENTITY ark-size          "228 KB">
+  <!ENTITY ark-buildsize     "11.7 MB">
+  <!ENTITY ark-time          "0.5 SBU">
 ]>
 
Index: kde/add/gwenview.xml
===================================================================
--- kde/add/gwenview.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/gwenview.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY gwenview-download-http "&kde-download-http;&kde-version;/src/gwenview-&kde-version;.tar.xz">
   <!ENTITY gwenview-download-ftp  "&kde-download-ftp;&kde-version;/src/gwenview-&kde-version;.tar.xz">
-  <!ENTITY gwenview-md5sum        "ea7690433a5b9bdeb871e79f0989dead">
+  <!ENTITY gwenview-md5sum        "55e2c3a850439ecb341028a46232b081">
   <!ENTITY gwenview-size          "2.8 MB">
-  <!ENTITY gwenview-buildsize     "25 MB">
-  <!ENTITY gwenview-time          "1.5 SBU">
+  <!ENTITY gwenview-buildsize     "49 MB">
+  <!ENTITY gwenview-time          "1.6 SBU">
 ]>
 
@@ -69,14 +69,14 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>
+       <xref linkend="libkdcraw"/> and 
+       <xref linkend="kdelibs"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="kactivities"/>,
-    <xref linkend="kde-baseapps"/>,
-    <xref linkend="nepomuk-core"/>,
-    <xref linkend="libkexiv2"/>, and
-    <xref linkend="libjpeg"/>
+      <para role="recommended">
+      <xref linkend="kactivities"/>,
+      <xref linkend="kde-baseapps"/>,
+      <xref linkend="libkexiv2"/>, and
+      <xref linkend="libjpeg"/>
     </para>
 
Index: kde/add/kate.xml
===================================================================
--- kde/add/kate.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/kate.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kate-download-http "&kde-download-http;&kde-version;/src/kate-&kde-version;.tar.xz">
   <!ENTITY kate-download-ftp  "&kde-download-ftp;&kde-version;/src/kate-&kde-version;.tar.xz">
-  <!ENTITY kate-md5sum        "cdc4424955043025b0b166b81bad2f25">
+  <!ENTITY kate-md5sum        "2db376237f9e9ff077ed6ff9f1af36ca">
   <!ENTITY kate-size          "2.6 MB">
-  <!ENTITY kate-buildsize     "79 MB">
-  <!ENTITY kate-time          "3.0 SBU">
+  <!ENTITY kate-buildsize     "156 MB">
+  <!ENTITY kate-time          "3.7 SBU">
 ]>
 
Index: kde/add/kdepim-runtime.xml
===================================================================
--- kde/add/kdepim-runtime.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/kdepim-runtime.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kdepim-runtime-download-http "&kde-download-http;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
   <!ENTITY kdepim-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-runtime-&kde-version;.tar.xz">
-  <!ENTITY kdepim-runtime-md5sum        "22a0122023ffe6ed4fc205ea21d22944">
+  <!ENTITY kdepim-runtime-md5sum        "07b29c5aa399ce5c2f93b64ac374cc8c">
   <!ENTITY kdepim-runtime-size          "1.1 MB">
-  <!ENTITY kdepim-runtime-buildsize     "101 MB">
-  <!ENTITY kdepim-runtime-time          "6.4 SBU">
+  <!ENTITY kdepim-runtime-buildsize     "175 MB">
+  <!ENTITY kdepim-runtime-time          "7.8 SBU">
 ]>
 
Index: kde/add/kdepim.xml
===================================================================
--- kde/add/kdepim.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/kdepim.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kdepim-download-http "&kde-download-http;&kde-version;/src/kdepim-&kde-version;.tar.xz">
   <!ENTITY kdepim-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepim-&kde-version;.tar.xz">
-  <!ENTITY kdepim-md5sum        "766100bec2aa83a73b8b9316339db1e0">
+  <!ENTITY kdepim-md5sum        "052bc3f77ef0fc8245c3cfda2c3f7a07">
   <!ENTITY kdepim-size          "13.8 MB">
   <!ENTITY kdepim-buildsize     "305 MB">
-  <!ENTITY kdepim-time          "18.5 SBU">
+  <!ENTITY kdepim-time          "24 SBU">
 ]>
 
@@ -69,5 +69,4 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="nepomuk-widgets"/>,
       <xref linkend="boost"/>, and
       <xref linkend="libassuan"/>
@@ -76,4 +75,5 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <ulink url="&kde-download-http;&kde-version;/src">nepomuk-widgets</ulink>,
       <ulink url="ftp://ftp.kde.org/pub/kde/stable/prison/1.0/src/">Prison</ulink>,
       <ulink url="http://dblatex.sourceforge.net/">dblatex</ulink> and
Index: kde/add/kdeplasma-addons.xml
===================================================================
--- kde/add/kdeplasma-addons.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/kdeplasma-addons.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kdeplasma-addons-download-http "&kde-download-http;&kde-version;/src/kdeplasma-addons-&kde-version;.tar.xz">
   <!ENTITY kdeplasma-addons-download-ftp  "&kde-download-ftp;&kde-version;/src/kdeplasma-addons-&kde-version;.tar.xz">
-  <!ENTITY kdeplasma-addons-md5sum        "75340aa2eff9fa17a1b52fa280e61ada">
+  <!ENTITY kdeplasma-addons-md5sum        "4f622aedcf5644772eec665a64231130">
   <!ENTITY kdeplasma-addons-size          "1.7 MB">
-  <!ENTITY kdeplasma-addons-buildsize     "73 MB">
-  <!ENTITY kdeplasma-addons-time          "3.4 SBU">
+  <!ENTITY kdeplasma-addons-buildsize     "133 MB">
+  <!ENTITY kdeplasma-addons-time          "3.9 SBU">
 ]>
 
@@ -70,16 +70,17 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kde-workspace"/> and
-    <xref linkend="kdepimlibs"/>
+      <xref linkend="kde-workspace"/> and
+      <xref linkend="kdepimlibs"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="libkexiv2"/>,
-    <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
-    <xref linkend="qjson"/>,
-    <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper),
-    <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin) and
-    <ulink url="https://github.com/ayoy/qoauth">QOAuth</ulink> (needed for the Plasma microblog dataengine)
+      <xref linkend="libkexiv2"/>,
+      <xref linkend="qjson"/>,
+      <ulink url="http://eigen.tuxfamily.org/">Eigen</ulink> (for the Mandelbrot wallpaper plugin) and
+      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
+      <ulink url="&kde-download-http;&kde-version;/src/">Nepomuk</ulink> 
+      <ulink url="http://edu.kde.org/marble/">Marble</ulink> (for the desktop globe wallpaper),
+      <ulink url="https://github.com/ayoy/qoauth">QOAuth</ulink> (needed for the Plasma microblog dataengine)
     </para>
 
Index: kde/add/kmix.xml
===================================================================
--- kde/add/kmix.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/kmix.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,7 +7,7 @@
   <!ENTITY kmix-download-http "&kde-download-http;&kde-version;/src/kmix-&kde-version;.tar.xz">
   <!ENTITY kmix-download-ftp  "&kde-download-ftp;&kde-version;/src/kmix-&kde-version;.tar.xz">
-  <!ENTITY kmix-md5sum        "ce098c21b50128b3eb0aac262acb9221">
-  <!ENTITY kmix-size          "369 KB">
-  <!ENTITY kmix-buildsize     "72 MB">
+  <!ENTITY kmix-md5sum        "1928724fdc6837aee333ad5d7f64221c">
+  <!ENTITY kmix-size          "372 KB">
+  <!ENTITY kmix-buildsize     "8.2 MB">
   <!ENTITY kmix-time          "1.1 SBU">
 ]>
Index: kde/add/konsole.xml
===================================================================
--- kde/add/konsole.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/konsole.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY konsole-download-http "&kde-download-http;&kde-version;/src/konsole-&kde-version;.tar.xz">
   <!ENTITY konsole-download-ftp  "&kde-download-ftp;&kde-version;/src/konsole-&kde-version;.tar.xz">
-  <!ENTITY konsole-md5sum        "c6ca91cfa29afef468b28ea9c5dba8e5">
-  <!ENTITY konsole-size          "445 KB">
-  <!ENTITY konsole-buildsize     "12 MB">
-  <!ENTITY konsole-time          "0.5 SBU">
+  <!ENTITY konsole-md5sum        "78c06092ac42297e03996c134b696850">
+  <!ENTITY konsole-size          "448 KB">
+  <!ENTITY konsole-buildsize     "26 MB">
+  <!ENTITY konsole-time          "0.7 SBU">
 ]>
 
Index: kde/add/libkcddb.xml
===================================================================
--- kde/add/libkcddb.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/libkcddb.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,7 +7,7 @@
   <!ENTITY libkcddb-download-http "&kde-download-http;&kde-version;/src/libkcddb-&kde-version;.tar.xz">
   <!ENTITY libkcddb-download-ftp  "&kde-download-ftp;&kde-version;/src/libkcddb-&kde-version;.tar.xz">
-  <!ENTITY libkcddb-md5sum        "587b0dd41c7d88dd694c704d92f7d634">
-  <!ENTITY libkcddb-size          "154 KB">
-  <!ENTITY libkcddb-buildsize     "7.0 MB">
+  <!ENTITY libkcddb-md5sum        "75ddb26cb22d5f3558fda7a7cabe12f9">
+  <!ENTITY libkcddb-size          "156 KB">
+  <!ENTITY libkcddb-buildsize     "10.1 MB">
   <!ENTITY libkcddb-time          "0.5 SBU">
 ]>
Index: kde/add/libkdcraw.xml
===================================================================
--- kde/add/libkdcraw.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
+++ kde/add/libkdcraw.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -0,0 +1,141 @@
+<?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 libkdcraw-download-http "&kde-download-http;&kde-version;/src/libkdcraw-&kde-version;.tar.xz">
+  <!ENTITY libkdcraw-download-ftp  "&kde-download-ftp;&kde-version;/src/libkdcraw-&kde-version;.tar.xz">
+  <!ENTITY libkdcraw-md5sum        "c25aeedc4dd68e37d358005a9b65a3e2">
+  <!ENTITY libkdcraw-size          "100 KB">
+  <!ENTITY libkdcraw-buildsize     "3.2 MB">
+  <!ENTITY libkdcraw-time          "0.1 SBU">
+]>
+
+<sect1 id="libkdcraw" xreflabel="libkdcraw-&kde-version;">
+  <?dbhtml filename="libkdcraw.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy: rthomsen $</othername>
+    <date>$Date: 2014-04-17 04:42:57 -0500 (Thu, 17 Apr 2014) $</date>
+  </sect1info>
+
+  <title>libkdcraw-&kde-version;</title>
+
+  <indexterm zone="libkdcraw">
+    <primary sortas="a-libkdcraw">libkdcraw</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libkdcraw</title>
+
+    <para>Libkdcraw is a C++ interface around the LibRaw library used to decode RAW
+    picture files.</para>
+
+    &lfs75_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libkdcraw-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libkdcraw-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libkdcraw-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libkdcraw-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libkdcraw-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libkdcraw-time;</para>
+      </listitem>
+    </itemizedlist>
+
+<!--
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+        url="&patch-root;/libkdcraw-&kde-version;-fixes-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+-->
+    <bridgehead renderas="sect3">Libkdcraw Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="kdelibs"/> and
+      <xref linkend="libraw"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="openssl"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libkdcraw"/>
+    </para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libkdcraw</title>
+
+    <para>Install <application>libkdcraw</application> by running
+    the following commands:</para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      -Wno-dev .. &amp;&amp;
+make</userinput></screen>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libkdcraw.so</seg>
+        <seg>&kde-dir;/include/libkdcraw and &kde-dir;/share/apps/libkdcraw</seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libkdcraw-prog">
+        <term><command>libkdcraw</command></term>
+        <listitem>
+          <para>is the KDE image viewer.</para>
+          <indexterm zone="libkdcraw libkdcraw-prog">
+            <primary sortas="b-libkdcraw">libkdcraw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: kde/add/libkexiv2.xml
===================================================================
--- kde/add/libkexiv2.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/libkexiv2.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,7 +7,7 @@
   <!ENTITY libkexiv2-download-http "&kde-download-http;&kde-version;/src/libkexiv2-&kde-version;.tar.xz">
   <!ENTITY libkexiv2-download-ftp  "&kde-download-ftp;&kde-version;/src/libkexiv2-&kde-version;.tar.xz">
-  <!ENTITY libkexiv2-md5sum        "41e2d4e549bfc27caab051c829b49df3">
-  <!ENTITY libkexiv2-size          "133 KB">
-  <!ENTITY libkexiv2-buildsize     "4.2 MB">
+  <!ENTITY libkexiv2-md5sum        "1323f24d3206cecd6218faed37d5cf84">
+  <!ENTITY libkexiv2-size          "136 KB">
+  <!ENTITY libkexiv2-buildsize     "16 MB">
   <!ENTITY libkexiv2-time          "0.3 SBU">
 ]>
Index: kde/add/okular.xml
===================================================================
--- kde/add/okular.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/add/okular.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY okular-download-http "&kde-download-http;&kde-version;/src/okular-&kde-version;.tar.xz">
   <!ENTITY okular-download-ftp  "&kde-download-ftp;&kde-version;/src/okular-&kde-version;.tar.xz">
-  <!ENTITY okular-md5sum        "0cdaedc69575e5842c67072440f49885">
+  <!ENTITY okular-md5sum        "2498bde835a74dfb09c704947d9ec000">
   <!ENTITY okular-size          "1.5 MB">
-  <!ENTITY okular-buildsize     "30 MB">
-  <!ENTITY okular-time          "1.4 SBU">
+  <!ENTITY okular-buildsize     "56 MB">
+  <!ENTITY okular-time          "1.6 SBU">
 ]>
 
Index: kde/core/akonadi.xml
===================================================================
--- kde/core/akonadi.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/akonadi.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -64,10 +64,14 @@
     <para role="required">
     <xref linkend="shared-mime-info"/>,
-    <xref linkend="boost"/>,
-    <xref linkend="soprano"/>, and one of:
+    <xref linkend="boost"/>, and one of:
      <xref linkend="sqlite"/>,
      <xref linkend="mariadb"/>, 
      <ulink url="http://www.mysql.com/">MySQL</ulink>, or
      <xref linkend="postgresql"/>
+    </para>
+
+    <bridgehead renderas="sect4">OPtional</bridgehead>
+    <para role="optional">
+      <ulink url="&sourceforge-repo;/soprano/">soprano</ulink>
     </para>
 
Index: kde/core/baloo-widgets.xml
===================================================================
--- kde/core/baloo-widgets.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/baloo-widgets.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY baloo-widgets-download-http "&kde-download-http;&kde-version;/src/baloo-widgets-&kde-version;.tar.xz">
   <!ENTITY baloo-widgets-download-ftp  "&kde-download-ftp;&kde-version;/src/baloo-widgets-&kde-version;.tar.xz">
-  <!ENTITY baloo-widgets-md5sum        "1549e337098a15c0eba9aba38d185ce6">
-  <!ENTITY baloo-widgets-size          "31 KB">
-  <!ENTITY baloo-widgets-buildsize     "10 MB">
-  <!ENTITY baloo-widgets-time          "0.2 SBU">
+  <!ENTITY baloo-widgets-md5sum        "558f082fdad05bc9636cef4f73d27aac">
+  <!ENTITY baloo-widgets-size          "32 KB">
+  <!ENTITY baloo-widgets-buildsize     "3.3 MB">
+  <!ENTITY baloo-widgets-time          "0.1 SBU">
 ]>
 
@@ -60,5 +60,5 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="baloo"/>
+      <xref linkend="baloo"/>
     </para>
 
Index: kde/core/baloo.xml
===================================================================
--- kde/core/baloo.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/baloo.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY baloo-download-http "&kde-download-http;&kde-version;/src/baloo-&kde-version;.tar.xz">
   <!ENTITY baloo-download-ftp  "&kde-download-ftp;&kde-version;/src/baloo-&kde-version;.tar.xz">
-  <!ENTITY baloo-md5sum        "241014ab8a6bfcf4b3cff6d1a9326868">
-  <!ENTITY baloo-size          "121 KB">
-  <!ENTITY baloo-buildsize     "151 MB">
-  <!ENTITY baloo-time          "1.9 SBU">
+  <!ENTITY baloo-md5sum        "e98b513d70a5dcb32bce503cea41e598">
+  <!ENTITY baloo-size          "124 KB">
+  <!ENTITY baloo-buildsize     "30 MB">
+  <!ENTITY baloo-time          "2.1 SBU">
 ]>
 
@@ -60,7 +60,12 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdepimlibs"/>,
-    <xref linkend="kfilemetadata"/> and
-    <xref linkend="xapian"/>
+      <xref linkend="kdepimlibs"/>,
+      <xref linkend="kfilemetadata"/> and
+      <xref linkend="xapian"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="openssl"/>
     </para>
 
Index: kde/core/core.xml
===================================================================
--- kde/core/core.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/core.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -23,5 +23,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="attica.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qimageblitz.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shrdesktopontologies.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shrdesktopontologies.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-qt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="oxygen-icons.xml"/>
@@ -32,6 +32,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="baloo-widgets.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="polkit-kde-agent.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-widgets.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-core.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nepomuk-widgets.xml"/> -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kactivities.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-runtime.xml"/>
Index: kde/core/kactivities.xml
===================================================================
--- kde/core/kactivities.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kactivities.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kactivities-download-http "&kde-download-http;&kde-version;/src/kactivities-&kde-version;.tar.xz">
   <!ENTITY kactivities-download-ftp  "&kde-download-ftp;&kde-version;/src/kactivities-&kde-version;.tar.xz">
-  <!ENTITY kactivities-md5sum        "383b3195b3dd0c40605d1a67e353975f">
-  <!ENTITY kactivities-size          "85 KB">
-  <!ENTITY kactivities-buildsize     "10.8 MB">
-  <!ENTITY kactivities-time          "0.9 SBU">
+  <!ENTITY kactivities-md5sum        "27b7c20787e6a13d3536194732f0fcfa">
+  <!ENTITY kactivities-size          "88 KB">
+  <!ENTITY kactivities-buildsize     "9.1 MB">
+  <!ENTITY kactivities-time          "1.0 SBU">
 ]>
 
@@ -69,14 +69,14 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>
+      <xref linkend="kdelibs"/>
     </para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="nepomuk-core"/>
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <ulink url="&kde-download-http;&kde-version;/src">nepomuk-core</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/kactivities"/>
+      <ulink url="&blfs-wiki;/kactivities"/>
     </para>
 
Index: kde/core/kde-base-artwork.xml
===================================================================
--- kde/core/kde-base-artwork.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kde-base-artwork.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,7 +7,7 @@
   <!ENTITY kde-base-artwork-download-http "&kde-download-http;&kde-version;/src/kde-base-artwork-&kde-version;.tar.xz">
   <!ENTITY kde-base-artwork-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-base-artwork-&kde-version;.tar.xz">
-  <!ENTITY kde-base-artwork-md5sum        "272a9bc31e53ee50e54159de727cf1dd">
+  <!ENTITY kde-base-artwork-md5sum        "b737d760539c87c1d1b7492fe636f429">
   <!ENTITY kde-base-artwork-size          "7.1 MB">
-  <!ENTITY kde-base-artwork-buildsize     "7.9 MB">
+  <!ENTITY kde-base-artwork-buildsize     "15 MB">
   <!ENTITY kde-base-artwork-time          "less than 0.1 SBU">
 ]>
Index: kde/core/kde-baseapps.xml
===================================================================
--- kde/core/kde-baseapps.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kde-baseapps.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kde-baseapps-download-http "&kde-download-http;&kde-version;/src/kde-baseapps-&kde-version;.tar.xz">
   <!ENTITY kde-baseapps-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-baseapps-&kde-version;.tar.xz">
-  <!ENTITY kde-baseapps-md5sum        "8552f030011cc09ffb5bacd2cd730df9">
+  <!ENTITY kde-baseapps-md5sum        "a1cfb985ad9275d958a978f2f6fe11fb">
   <!ENTITY kde-baseapps-size          "2.4 MB">
-  <!ENTITY kde-baseapps-buildsize     "84 MB">
-  <!ENTITY kde-baseapps-time          "4.3 SBU">
+  <!ENTITY kde-baseapps-buildsize     "103 MB">
+  <!ENTITY kde-baseapps-time          "5.1 SBU">
 ]>
 
Index: kde/core/kde-runtime.xml
===================================================================
--- kde/core/kde-runtime.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kde-runtime.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kde-runtime-download-http "&kde-download-http;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
   <!ENTITY kde-runtime-download-ftp  "&kde-download-ftp;&kde-version;/src/kde-runtime-&kde-version;.tar.xz">
-  <!ENTITY kde-runtime-md5sum        "05f2e2b14f19fdd4b224cb081970bf8f">
+  <!ENTITY kde-runtime-md5sum        "941c87ac36f67354a3f6788b96b19035">
   <!ENTITY kde-runtime-size          "7.5 MB">
-  <!ENTITY kde-runtime-buildsize     "111 MB">
-  <!ENTITY kde-runtime-time          "4.7 SBU">
+  <!ENTITY kde-runtime-buildsize     "145 MB">
+  <!ENTITY kde-runtime-time          "5.3 SBU">
 ]>
 
@@ -61,29 +61,28 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>
+      <xref linkend="kdelibs"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="kactivities"/>,
-    <xref linkend="kdepimlibs"/>,
-    <xref linkend="alsa-lib"/>,
-    <xref linkend="libjpeg"/> and
-    <xref linkend="exiv2"/>
+      <para role="recommended">
+      <xref linkend="kactivities"/>,
+      <xref linkend="kdepimlibs"/>,
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="libjpeg"/> and
+      <xref linkend="exiv2"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="nepomuk-core"/>,
-    <xref linkend="gdb"/>,
-    <xref linkend="pulseaudio"/>,
-    <xref linkend="xine-lib"/>,
-    <xref linkend="libcanberra"/>,
-    <xref linkend="samba"/>,
-    <xref linkend="NetworkManager"/>,
-    <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
-    <ulink url="http://launchpad.net/ntrack">QNtrack</ulink>,
-    <ulink url="http://www.libssh.org/">LibSSH</ulink> and
-    <ulink url="http://www.openexr.com/">OpenEXR</ulink>
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="xine-lib"/>,
+      <xref linkend="libcanberra"/>,
+      <xref linkend="samba"/>,
+      <xref linkend="NetworkManager"/>,
+      <ulink url="&kde-download-http;&kde-version;/src/">nepomuk-core</ulink>,
+      <ulink url="http://www.openslp.org/">OpenSLP</ulink>,
+      <ulink url="http://launchpad.net/ntrack">QNtrack</ulink>,
+      <ulink url="http://www.libssh.org/">LibSSH</ulink> and
+      <ulink url="http://www.openexr.com/">OpenEXR</ulink>
     </para>
 
Index: kde/core/kde-workspace.xml
===================================================================
--- kde/core/kde-workspace.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kde-workspace.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -5,10 +5,10 @@
   %general-entities;
 
-  <!ENTITY kde-workspace-download-http "&kde-download-http;4.12.4/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;4.12.4/src/kde-workspace-&kde-workspace-version;.tar.xz">
-  <!ENTITY kde-workspace-md5sum        "b572766a80d7c26db02bf24d5f7cb514">
+  <!ENTITY kde-workspace-download-http "&kde-download-http;4.12.5/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-download-ftp  "&kde-download-ftp;4.12.5/src/kde-workspace-&kde-workspace-version;.tar.xz">
+  <!ENTITY kde-workspace-md5sum        "aed023f4a48a26890e9d54a44f45d2d9">
   <!ENTITY kde-workspace-size          "12.9 MB">
-  <!ENTITY kde-workspace-buildsize     "306 MB">
-  <!ENTITY kde-workspace-time          "14 SBU">
+  <!ENTITY kde-workspace-buildsize     "521 MB">
+  <!ENTITY kde-workspace-time          "17 SBU">
 ]>
 
@@ -85,5 +85,4 @@
     <para role="recommended">
       <xref linkend="kdepimlibs"/>,
-      <xref linkend="nepomuk-core"/>,
       <xref linkend="boost"/>,
       <xref linkend="freetype2"/>,
Index: kde/core/kdelibs.xml
===================================================================
--- kde/core/kdelibs.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kdelibs.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kdelibs-download-http "&kde-download-http;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
   <!ENTITY kdelibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdelibs-&kde-version;.tar.xz">
-  <!ENTITY kdelibs-md5sum        "8e942f5ca010af69b078bfe549c2e947">
+  <!ENTITY kdelibs-md5sum        "1d852f609bd1d5bc34da43cdb1c626b9">
   <!ENTITY kdelibs-size          "11.0 MB">
-  <!ENTITY kdelibs-buildsize     "383 MB">
-  <!ENTITY kdelibs-time          "19 SBU">
+  <!ENTITY kdelibs-buildsize     "463 MB">
+  <!ENTITY kdelibs-time          "22 SBU">
 ]>
 
@@ -70,14 +70,11 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="phonon"/>,
-    <xref linkend="attica"/>,
-    <xref linkend="soprano"/>,
-    <xref linkend="strigi"/>,
-    <xref linkend="qca"/>,
-    <xref linkend="libdbusmenu-qt"/>,
-    <xref linkend="DocBook"/>,
-    <xref linkend="docbook-xsl"/>,
-    <xref linkend="shared-desktop-ontologies"/>, and
-    <xref linkend="shared-mime-info"/>
+      <xref linkend="phonon"/>,
+      <xref linkend="attica"/>,
+      <xref linkend="strigi"/>,
+      <xref linkend="libdbusmenu-qt"/>,
+      <xref linkend="DocBook"/>,
+      <xref linkend="docbook-xsl"/>, and
+      <xref linkend="shared-mime-info"/>
     </para>
 
@@ -88,4 +85,6 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="giflib"/>,
+      <xref linkend="openssl"/>,
+      <xref linkend="qca"/>,
       <xref linkend="upower"/>, and
       <xref linkend="udisks"/> or <xref linkend="udisks2"/>
@@ -97,9 +96,10 @@
       <xref linkend="pcre"/>,
       <xref linkend="avahi"/>,
-      <xref linkend="openssl"/>,
       <xref linkend="aspell"/>,
       <xref linkend="enchant"/>,
       <xref linkend="grantlee"/>,
       <xref linkend="mitkrb"/>,
+      <ulink url="&sourceforge-repo;/soprano">soprano</ulink>,
+      <ulink url="&sourceforge-repo;/oscaf/">shared-desktop-ontologies</ulink>,
       <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink>,
       <ulink url="http://oss.sgi.com/projects/fam/">FAM</ulink>,
Index: kde/core/kdepimlibs.xml
===================================================================
--- kde/core/kdepimlibs.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kdepimlibs.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,8 +7,8 @@
   <!ENTITY kdepimlibs-download-http "&kde-download-http;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
   <!ENTITY kdepimlibs-download-ftp  "&kde-download-ftp;&kde-version;/src/kdepimlibs-&kde-version;.tar.xz">
-  <!ENTITY kdepimlibs-md5sum        "90c70871a16ad7e10ff80a79dab81541">
+  <!ENTITY kdepimlibs-md5sum        "77f807a6a19f5a4c4e9716b972bd7253">
   <!ENTITY kdepimlibs-size          "2.7 MB">
-  <!ENTITY kdepimlibs-buildsize     "169 MB">
-  <!ENTITY kdepimlibs-time          "8.7 SBU">
+  <!ENTITY kdepimlibs-buildsize     "216 MB">
+  <!ENTITY kdepimlibs-time          "10 SBU">
 ]>
 
@@ -71,17 +71,23 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="gpgme"/>,
-    <xref linkend="libical"/>,
-    <xref linkend="akonadi"/>,
-    <xref linkend="cyrus-sasl"/>,
-    <xref linkend="boost"/> and
-    <xref linkend="qjson"/>
+      <xref linkend="kdelibs"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="gpgme"/>,
+      <xref linkend="libical"/>,
+      <xref linkend="akonadi"/>,
+      <xref linkend="cyrus-sasl"/>,
+      <xref linkend="boost"/> and
+      <xref linkend="qjson"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="openldap"/>
+      <xref linkend="openldap"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="openssl"/>
+      <ulink url="http://projects.kde.org/prison">prison</ulink>
     </para>
 
Index: kde/core/kfilemetadata.xml
===================================================================
--- kde/core/kfilemetadata.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/kfilemetadata.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,7 +7,7 @@
   <!ENTITY kfilemetadata-download-http "&kde-download-http;&kde-version;/src/kfilemetadata-&kde-version;.tar.xz">
   <!ENTITY kfilemetadata-download-ftp  "&kde-download-ftp;&kde-version;/src/kfilemetadata-&kde-version;.tar.xz">
-  <!ENTITY kfilemetadata-md5sum        "7f4ac268c1b90ea39e01932048596d3c">
-  <!ENTITY kfilemetadata-size          "35 KB">
-  <!ENTITY kfilemetadata-buildsize     "15 MB">
+  <!ENTITY kfilemetadata-md5sum        "79208182f3c9b7d15a227b0392994f2c">
+  <!ENTITY kfilemetadata-size          "36 KB">
+  <!ENTITY kfilemetadata-buildsize     "4.2 MB">
   <!ENTITY kfilemetadata-time          "0.2 SBU">
 ]>
Index: e/core/nepomuk-core.xml
===================================================================
--- kde/core/nepomuk-core.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ 	(revision )
@@ -1,136 +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 nepomuk-core-download-http "&kde-download-http;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-core-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-core-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-core-md5sum        "b73d88658f0405d5f705c469d2697a9a">
-  <!ENTITY nepomuk-core-size          "374 KB">
-  <!ENTITY nepomuk-core-buildsize     "41 MB">
-  <!ENTITY nepomuk-core-time          "1.9 SBU">
-]>
-
-<sect1 id="nepomuk-core" xreflabel="nepomuk-core-&kde-version;">
-  <?dbhtml filename="nepomuk-core.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Nepomuk-core-&kde-version;</title>
-
-  <indexterm zone="nepomuk-core">
-    <primary sortas="a-nepomuk-core">nepomuk-core</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Nepomuk-core</title>
-
-    <para>Nepomuk-core contains the Semantik Desktop core libraries. This
-    includes central services like file indexing, file system monitoring,
-    query, and of course storage, as well as the corresponding client
-    libraries.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nepomuk-core-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nepomuk-core-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nepomuk-core-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nepomuk-core-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nepomuk-core-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nepomuk-core-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Nepomuk-core Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="kdelibs"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="kfilemetadata"/>,
-    <xref linkend="baloo"/>,
-    <xref linkend="poppler"/>,
-    <xref linkend="taglib"/>,
-    <xref linkend="exiv2"/> and
-    <xref linkend="ffmpeg"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <ulink url="http://sourceforge.net/projects/ebook-tools">libepub</ulink> and
-    <ulink url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket">Mobipocket</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/nepomuk-core"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Nepomuk-core</title>
-
-    <para>Install <application>nepomuk-core</application> by running the following
-    commands:</para>
-
-<!-- Nothing is installed in sysconfdir ... -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a working test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>nepomuk-simplesource-rcgen, nepomuk2-rcgen, nepomukbackup,
-        nepomukcleaner, nepomukindexer, nepomukserver and
-        nepomukservicestub</seg>
-        <seg>libkdeinit4_nepomukserver.so, libnepomukcommon.so,
-        libnepomukcore.so and several in
-        &kde-dir;/lib/kde4</seg>
-        <seg>&kde-dir;/include/nepomuk2, &kde-dir;/include/Nepomuk2,
-        &kde-dir;/lib/cmake/NepomukCore and several in
-        &kde-dir;/share/apps</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: e/core/nepomuk-widgets.xml
===================================================================
--- kde/core/nepomuk-widgets.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ 	(revision )
@@ -1,123 +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 nepomuk-widgets-download-http "&kde-download-http;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-widgets-download-ftp  "&kde-download-ftp;&kde-version;/src/nepomuk-widgets-&kde-version;.tar.xz">
-  <!ENTITY nepomuk-widgets-md5sum        "21f54a8a36dd7396239513190e31d4ef">
-  <!ENTITY nepomuk-widgets-size          "48 KB">
-  <!ENTITY nepomuk-widgets-buildsize     "3.8 MB">
-  <!ENTITY nepomuk-widgets-time          "0.2 SBU">
-]>
-
-<sect1 id="nepomuk-widgets" xreflabel="nepomuk-widgets-&kde-version;">
-  <?dbhtml filename="nepomuk-widgets.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Nepomuk-widgets-&kde-version;</title>
-
-  <indexterm zone="nepomuk-widgets">
-    <primary sortas="a-nepomuk-widgets">nepomuk-widgets</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to nepomuk-widgets</title>
-
-    <para>Nepomuk-widgets contains the widget library for the Nepomuk Semantik
-    Desktop.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&nepomuk-widgets-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&nepomuk-widgets-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &nepomuk-widgets-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &nepomuk-widgets-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &nepomuk-widgets-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &nepomuk-widgets-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/nepomuk-widgets-&kde-version;-rpc_fix-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
- -->
-
-    <bridgehead renderas="sect3">Nepomuk-widgets Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="nepomuk-core"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/nepomuk-widgets"/>
-    </para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of nepomuk-widgets</title>
-
-    <para>Install <application>nepomuk-widgets</application> by running the following
-    commands:</para>
-
-<!-- Nothing is installed in sysconfdir ... -->
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
-      -DCMAKE_BUILD_TYPE=Release         \
-      -Wno-dev .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make test</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>libnepomukwidgets.so</seg>
-        <seg>&kde-dir;/include/nepomuk2 and
-        &kde-dir;/lib/cmake/NepomukWidgets</seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: kde/core/oxygen-icons.xml
===================================================================
--- kde/core/oxygen-icons.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ kde/core/oxygen-icons.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -7,7 +7,7 @@
   <!ENTITY oxygen-icons-download-http "&kde-download-http;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
   <!ENTITY oxygen-icons-download-ftp  "&kde-download-ftp;&kde-version;/src/oxygen-icons-&kde-version;.tar.xz">
-  <!ENTITY oxygen-icons-md5sum        "f0f11d95150f2bc5c2d00c4f329abc75">
+  <!ENTITY oxygen-icons-md5sum        "6cc0b248ff9f33ccac5bc185a3e95c61">
   <!ENTITY oxygen-icons-size          "219 MB">
-  <!ENTITY oxygen-icons-buildsize     "465 MB">
+  <!ENTITY oxygen-icons-buildsize     "510 MB">
   <!ENTITY oxygen-icons-time          "less than 0.1 SBU">
 ]>
Index: e/core/shrdesktopontologies.xml
===================================================================
--- kde/core/shrdesktopontologies.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ 	(revision )
@@ -1,112 +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 shared-desktop-ontologies-download-http
-           "&sourceforge-repo;/oscaf/shared-desktop-ontologies-&shared-desktop-ontologies-version;.tar.bz2">
-  <!ENTITY shared-desktop-ontologies-download-ftp  " ">
-  <!ENTITY shared-desktop-ontologies-md5sum        "db75d155ac9b60e3d187e23544744acc">
-  <!ENTITY shared-desktop-ontologies-size          "3.8 MB">
-  <!ENTITY shared-desktop-ontologies-buildsize     "6.7 MB">
-  <!ENTITY shared-desktop-ontologies-time          "less than 0.1 SBU">
-]>
-
-<sect1 id="shared-desktop-ontologies" xreflabel="shared-desktop-ontologies-&shared-desktop-ontologies-version;">
-  <?dbhtml filename="shared-desktop-ontologies.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Shared-desktop-ontologies-&shared-desktop-ontologies-version;</title>
-
-  <indexterm zone="shared-desktop-ontologies">
-    <primary sortas="a-shared-desktop-ontologies">shared-desktop-ontologies</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Shared-Desktop-Ontologies</title>
-
-    <para>The Shared desktop ontologies provide RDF vocabularies for the
-    Semantic Desktop. This includes basic ontologies like RDF and RDFS and all
-    the Nepomuk ontologies like NRL, NIE, and NFO, which are also maintained
-    and developed in this open-source project.</para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&shared-desktop-ontologies-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&shared-desktop-ontologies-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &shared-desktop-ontologies-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &shared-desktop-ontologies-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &shared-desktop-ontologies-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &shared-desktop-ontologies-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Shared-desktop-ontologies Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/shared-desktop-ontologies"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Shared-desktop-ontologies</title>
-
-    <para>Install <application>Shared-desktop-ontologies</application> by
-    running the following commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; -Wno-dev ..</userinput></screen>
-
-    <para>
-      This package does not come with a test suite.
-    </para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>none</seg>
-        <seg>none</seg>
-        <seg>&kde-dir;/share/ontology and
-        &kde-dir;/share/cmake/SharedDesktopOntologies</seg>
-      </seglistitem>
-    </segmentedlist>
-  </sect2>
-
-</sect1>
Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ multimedia/audioutils/amarok.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -84,6 +84,5 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="ffmpeg"/>, and
-      <xref linkend="nepomuk-core"/>
+      <xref linkend="ffmpeg"/>
     </para>
 
@@ -94,4 +93,5 @@
       <xref linkend="openssl"/> (for MP3tunes integration),
       <xref linkend="qjson"/>,
+      <ulink url="&kde-download-http;&kde-version;/src/">nepomuk-core</ulink>,
       <ulink url="http://kollide.net/~jefferai/">Taglib-extras</ulink>,
       <ulink url="http://code.google.com/p/clamz/">Clamz</ulink> (For Amazon integration),
Index: server/other/other.xml
===================================================================
--- server/other/other.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ server/other/other.xml	(revision 33e57610a1a26a361caaa4266bb2d694f5d5c977)
@@ -24,7 +24,7 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openldap.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soprano.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soprano.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="unbound.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtuoso.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtuoso.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xinetd.xml"/>
 
Index: rver/other/soprano.xml
===================================================================
--- server/other/soprano.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ 	(revision )
@@ -1,235 +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 soprano-download-http "&sourceforge-repo;/soprano/soprano-&soprano-version;.tar.bz2">
-  <!ENTITY soprano-download-ftp  " ">
-  <!ENTITY soprano-md5sum        "91413e5783efeee0beb747ea4c5c9ef0">
-  <!ENTITY soprano-size          "1.9 MB">
-  <!ENTITY soprano-buildsize     "22 MB">
-  <!ENTITY soprano-time          "0.6 SBU">
-]>
-
-<sect1 id="soprano" xreflabel="Soprano-&soprano-version;">
-  <?dbhtml filename="soprano.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Soprano-&soprano-version;</title>
-
-  <indexterm zone="soprano">
-    <primary sortas="a-Soprano">Soprano</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Soprano</title>
-
-    <para>
-      <application>Soprano</application> (formally known as QRDF) is a
-      library which provides a nice Qt interface to RDF storage solutions.
-      It has a modular structure which allows to replace the actual RDF
-      storage  implementation used.
-    </para>
-
-    &lfs75_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Download (HTTP): <ulink url="&soprano-download-http;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download (FTP): <ulink url="&soprano-download-ftp;"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download MD5 sum: &soprano-md5sum;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Download size: &soprano-size;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated disk space required: &soprano-buildsize;
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Estimated build time: &soprano-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/soprano-&soprano-version;-dbus-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Soprano Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="qt4"/>, and
-      <xref linkend="redland"/>
-    </para>
-
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-      <xref linkend="clucene"/>,
-      <xref linkend="dbus"/>,
-      <xref linkend="libiodbc"/> (required for the Virtuoso backend. Additionally,
-      <xref linkend="virtuoso"/> is required as a runtime dependency for this
-      backend.)
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="doxygen"/> (to build the documentation) and
-      <ulink url="http://www.openrdf.org/">Sesame2</ulink>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-      <ulink url="&blfs-wiki;/soprano"/>
-    </para>
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Soprano</title>
-
-    <para>Install <application>soprano</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../soprano-&soprano-version;-dbus-1.patch &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      .. &amp;&amp;
-make</userinput></screen>
-
-    <para>This package does not come with a working test suite.</para>
-
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-</sect2>
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <option>-DSOPRANO_DISABLE_CLUCENE_INDEX=ON</option>: This switch disables
-      compilation of Clucene-based full-text index.
-    </para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuration of Soprano</title>
-
-    <para>
-      Create a directory where <application>Soprano</application> places some
-      runtime data as the <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>install -m755 -d /srv/soprano</userinput></screen>
-
-    <para>
-      The <command>sopranod</command> accepts some parameters. To configure
-      how the bootscript starts <command>sopranod</command>,
-      create a configuration file again as the 
-      <systemitem class="username">root</systemitem> user:
-    </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sysconfig/soprano &lt;&lt;EOF
-# Begin /etc/sysconfig/soprano
-
-SOPRANO_STORAGE="/srv/soprano"
-SOPRANO_BACKEND="virtuoso"                       # virtuoso, sesame2, redland
-#SOPRANO_OPTIONS="$SOPRANO_OPTIONS --port 4711"  # Default port is 5000
-
-# End /etc/sysconfig/soprano
-EOF</userinput></screen>
-
-<sect3 id="soprano-init">
-      <title>Boot Script</title>
-
-      <note>
-        <para>
-          It is not required to start the <application>Soprano</application>
-          server at boottime for <application>KDE</application>.
-          <application>KDE</application> will start
-          <application>Soprano</application> as needed.
-        </para>
-      </note>
-
-      <para>
-        In order to get <application>Soprano</application> started
-        automatically when the system is booted, install the
-        <filename>/etc/rc.d/init.d/soprano</filename> init script included
-        in the <xref linkend="bootscripts"/> package as the  
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-      <indexterm zone="soprano soprano-init">
-        <primary sortas="f-soprano">soprano</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-soprano</userinput></screen>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          onto2vocabularyclass, sopranocmd, and sopranod
-        </seg>
-        <seg>
-          libsopranoclient.so, libsopranoindex.so, libsopranoserver.so, and libsoprano.so
-        </seg>
-        <seg>
-          /usr/include/soprano,
-          /usr/include/Soprano,
-          /usr/lib/soprano, and
-          /usr/share/soprano
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: rver/other/virtuoso.xml
===================================================================
--- server/other/virtuoso.xml	(revision 6054745efb93f314cc9a7b4242bdec111f530995)
+++ 	(revision )
@@ -1,297 +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 virtuoso-download-http "&sourceforge-repo;/virtuoso/virtuoso-opensource-&virtuoso-version;.tar.gz">
-  <!ENTITY virtuoso-download-ftp  " ">
-  <!ENTITY virtuoso-md5sum        "94ef4f93cad915f73bee547fe95db725">
-  <!ENTITY virtuoso-size          "113 MB">
-  <!ENTITY virtuoso-buildsize     "895 MB (additional 2 GB to run the test suite)">
-  <!ENTITY virtuoso-time          "3.3 SBU (additional 22 SBU to run the test suite)">
-]>
-
-<sect1 id="virtuoso" xreflabel="Virtuoso-&virtuoso-version;">
-  <?dbhtml filename="virtuoso.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Virtuoso-&virtuoso-version;</title>
-
-  <indexterm zone="virtuoso">
-    <primary sortas="a-Virtuoso">Virtuoso</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Virtuoso</title>
-
-    <para><application>Virtuoso</application> is a cross-platform server that
-    implements multiple server-side protocols as part of a single-server product
-    offering. There is one server product that offers WebDAV/HTTP, Application,
-    and Database-server functionality alongside Native XML Storage, Universal
-    Data-Access Middleware, Business Process Integration and a Web-Services
-    Platform.</para>
-
-    &lfs75_built;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&virtuoso-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&virtuoso-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &virtuoso-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &virtuoso-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &virtuoso-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &virtuoso-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Virtuoso Dependencies</bridgehead>
-<!-- No longer needed?
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="net-tools"/>
-    </para>
--->
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended">
-    <xref linkend="libiodbc"/>,
-    <xref linkend="libxml2"/>,
-    <xref linkend="openssl"/>, and
-    <xref linkend="openldap"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="imagemagick"/>,
-    <xref linkend="python2"/>, and
-    <xref linkend="mitkrb"/>
-    <!-- Currently broken
-    <xref linkend="php"/>
-    <xref linkend="ruby"/>
-    <ulink url="https://libwbxml.opensync.org/">libwbxml</ulink
-    -->
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/virtuoso"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Virtuoso</title>
-
-    <para>Install <application>virtuoso</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i "s|virt_iodbc_dir/include|&amp;/iodbc|" configure  &amp;&amp;
-./configure --prefix=/usr                             \
-            --sysconfdir=/etc                         \
-            --localstatedir=/var                      \
-            --with-iodbc=/usr                         \
-            --with-readline                           \
-            --without-internal-zlib                   \
-            --program-transform-name="s/isql/isql-v/" \
-            --disable-all-vads                        \
-            --disable-static                          &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results, issue <command>make -k check</command>.
-    Some tests are known to fail.</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/virtuoso-&virtuoso-version; &amp;&amp;
-ln -s   -v          ../../virtuoso/doc \
-                    /usr/share/doc/virtuoso-&virtuoso-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><command>sed -i ...</command>: This command is used to modify the
-    <envar>CPPFLAGS</envar> variable so that the <application>libiodbc</application>
-    interface headers are found by the <command>configure</command> script.</para>
-
-    <para><parameter>--with-iodbc=/usr</parameter>: This parameter is used so
-    that the build will use the system <application>libiodbc</application> interface
-    headers and not the headers in the source tree.</para>
-
-    <para><parameter>--with-readline</parameter>: This parameter is used so that
-    the system <application>Readline</application> library is used.</para>
-
-    <para><parameter>--without-internal-zlib</parameter>: This parameter is set
-    so that the installed <application>zlib</application> library is used and
-    not the bundled one.</para>
-
-    <para><parameter>--program-transform-name</parameter>: Both
-    <application>Virtuoso</application> and <application>unixODBC</application>
-    install a program named <command>isql</command>. Use this parameter to rename
-    <application>virtuoso</application>s program to <command>isql-v</command>.</para>
-
-    <para><parameter>--disable-all-vads</parameter>: This parameter disables
-    building all the VAD packages (tutorials, demos, etc.).</para>
-
-    <para><parameter>--disable-static</parameter>: This option disables building
-    static libraries. However, the main <application>Virtuoso</application>
-    libraries, <filename class="libraryfile">libvirtuoso-t</filename> and
-    <filename class="libraryfile">libvirtuoso-iodbc-t</filename> are still
-    built as static libraries.</para>
-
-    <para><option>--enable-python</option>: Add this option if
-    <application>Python</application> is installed to enable building
-    <application>Python</application> bindings.</para>
-
-<!-- broken with JDK-version7
-    <para><option>-&#45;with-jdk4</option>: Add this option to specify the path
-    to the <xref linkend="jdk"/> and to enable making use of Java.</para>
--->
-
-    <para><option>--with-port</option>: Add this if you want the
-    <application>Virtuoso</application> server to listen on a port other than
-    1111.</para>
-
-    <para><option>--enable-aio</option>: Add this if you want
-    <application>Virtuoso</application> to perform asynchronous file I/O
-    operations instead of synchronous file I/O.</para>
-
-    <para><option>--enable-perl</option>: Do not use this option if you built
-    Perl according to the LFS instructions. The build will fail with a note
-    similar to <computeroutput>Your perl should be compiled w -Dusemultiplicity.
-    Check the output of perl -V:usemultiplicity</computeroutput>.</para>
-
-    <para>Note that passing the <option>with-jdk4=${JAVA_HOME}</option>,
-    <option>--enable-php5=/usr</option>, <option>--enable-ruby</option>, and
-    <option>--enable-wbxml2=/usr</option> options all will fail during the
-    <command>configure</command> phase of the build. They will not break
-    the build, but the desired support will not be included in the build.</para>
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuration</title>
-
-    <note><para>If <application>Virtuoso</application> is only to be used
-    for <application>KDE</application>, there is no need to start the
-    <application>Virtuoso</application> server at boot time.</para></note>
-
-    <sect3 id="virtuoso-init">
-      <title>Boot Script</title>
-
-      <para>If you want the <application>Virtuoso</application> server to
-      start automatically when the system is booted, install the
-      <filename>/etc/rc.d/init.d/virtuoso</filename> init script included
-      in the <xref linkend="bootscripts"/> package.</para>
-
-      <indexterm zone="virtuoso virtuoso-init">
-        <primary sortas="f-virtuoso">virtuoso</primary>
-      </indexterm>
-
-<screen role="root"><userinput>make install-virtuoso</userinput></screen>
-
-    </sect3>
-
-    <sect3 id="virtuoso-users">
-      <title>User accounts</title>
-
-      <para>When the server is started using the start script, there is a web
-      interface to <application>Virtuoso</application> at
-      <ulink url="http://localhost:8890/"/>. Several links are pointing to
-      the OpenLink site, but the <application>Conductor</application> at
-      <ulink url="http://localhost:8890/conductor/"/>. This is a full featured
-      configuration site for <application>Virtuoso</application>. Login as
-      <systemitem class="username">dba</systemitem> with the predefined
-      password <literal>dba</literal>.</para>
-
-      <warning>
-        <title>Change password</title>
-
-        <para>Remember to immediately change the password of user
-        <systemitem class="username">dba</systemitem> as well as of all other
-        predefined users. Click on <literal>[System Admin]</literal> and
-        than on <literal>[User Accounts]</literal>.</para>
-
-      </warning>
-    </sect3>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          inifile, isql-v, isql-v-iodbc, isql-vw, isql-vw-iodbc, odbc_mail,
-          virt_mail, virtuoso-iodbc-t, and virtuoso-t
-        </seg>
-        <seg>
-          libvirtuoso-iodbc-t.a, libvirtuoso-t.a, virtodbc.so, virtodbc_r.so,
-          virtodbcu.so, and virtodbcu_r.so
-        </seg>
-        <seg>
-          /usr/lib/hibernate,
-          /usr/lib/jdbc-2.0,
-          /usr/lib/jdbc-3.0,
-          /usr/lib/jdbc-4.0,
-          /usr/lib/jdbc-4.1,
-          /usr/lib/jena,
-          /usr/lib/jena2,
-          /usr/lib/sesame,
-          /usr/lib/virtuoso
-          /usr/share/doc/virtuoso-&virtuoso-version;,
-          /usr/share/virtuoso, and
-          /var/lib/virtuoso
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="isql-v">
-        <term><command>isql-v</command></term>
-        <listitem>
-          <para>is an interactive SQL utility.</para>
-          <indexterm zone="virtuoso isql-v">
-            <primary sortas="b-isql-v">isql-v</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="virtuoso-t">
-        <term><command>virtuoso-t</command></term>
-        <listitem>
-          <para>is the Universial Server daemon.</para>
-          <indexterm zone="virtuoso virtuoso-t">
-            <primary sortas="b-virtuoso-t">virtuoso-t</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
