Index: archive/udev-extras.xml
===================================================================
--- archive/udev-extras.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
+++ archive/udev-extras.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -0,0 +1,209 @@
+<?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 eudev-download-http "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
+  <!ENTITY eudev-download-ftp  " ">
+  <!ENTITY eudev-md5sum        "80649a0350ff9620fc2da9562d9f2a6a">
+  <!ENTITY eudev-size          "1.7 MB">
+  <!ENTITY eudev-buildsize     "23 MB">
+  <!ENTITY eudev-time          "0.3 SBU">
+
+  <!ENTITY eudev-svn-download-http "http://dev.gentoo.org/~blueness/eudev">
+]>
+
+<sect1 id="udev-extras" xreflabel="udev-extras (from eudev)">
+  <?dbhtml filename="udev-extras.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>Udev Extras (from eudev)</title>
+
+  <indexterm zone="udev-extras">
+    <primary sortas="a-udev-extras">udev extras (from eudev)</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to Udev Extras</title>
+
+    <para><application>Eudev</application> was indeed installed in LFS and
+    there is no reason to reinstall it unless the user is going to install a
+    package such as <application>UPower</application> that needs libgudev.
+    These instructions enable building libgudev and also optionally create gir
+    data for <application>Eudev</application>.  </para>
+
+    <para>Unlike other packages in BLFS, there is no set version of
+    <application>Eudev</application> in this page's title and no set version
+    specified for download. Version updates to <application>Eudev</application>
+    makes it possible that the user's system may have an
+    <application>Eudev</application> version different from the one in the
+    current LFS book. Therefore, users should use the version of
+    <application>Eudev</application> their computer currently uses. With few
+    exceptions, the BLFS team has no experience updating (or reverting to an
+    older version) the <application>Eudev</application> package <quote>on the
+    fly</quote>.</para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <caution>
+      <para>
+         If you are using a version of BLFS different from your currently
+         installed base LFS system, you should use the Eudev source from your
+         LFS build.  Newer versions of Eudev may occasionally be incompatible
+         with former ones, either because they require some new options to be
+         enabled in the kernel or because they change the way rules are parsed.
+         For in-system updates to Eudev, you may want to consult <ulink
+         url="http:wiki.gentoo.org/wiki/Udev/upgrade">the Gentoo page</ulink>
+         about upgrading Udev. 
+      </para>
+    </caution>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&eudev-svn-download-http;"/></para>
+      </listitem>
+<!--      <listitem>
+        <para>Download (HTTP): <ulink url="&eudev-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&eudev-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &eudev-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &eudev-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &eudev-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &eudev-time;</para>
+      </listitem>-->
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Udev Extras Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome),
+      <xref linkend="docbook-xsl"/> and <xref linkend="libxslt"/> (to build
+      man pages, which are not shipped with the package), and
+      <xref linkend="gtk-doc"/> (to rebuild the documentation)
+    </para>
+
+    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
+    <para role="optional">
+      <xref linkend="pciutils"/> and
+      <xref linkend="usbutils"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/udev-extras"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of Udev Extras</title>
+
+    <para>First, re-build eudev:</para>
+
+<screen><userinput>sed -r -i 's|/usr(/bin/test)|\1|'         test/udev-test.pl  &amp;&amp;
+
+./configure --prefix=/usr           \
+            --bindir=/sbin          \
+            --sbindir=/sbin         \
+            --libdir=/usr/lib       \
+            --sysconfdir=/etc       \
+            --libexecdir=/lib       \
+            --with-rootprefix=      \
+            --with-rootlibdir=/lib  \
+            --enable-split-usr      \
+            --enable-libkmod        \
+            --enable-rule_generator \
+            --enable-keymap         \
+            --disable-introspection \
+            --disable-gtk-doc-html  \
+            --disable-static        &amp;&amp;
+
+make</userinput></screen>
+
+   <para>To test the results, issue: <command>make check</command>.</para>
+
+   <para>Now re-install 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>--disable-introspection</parameter>: This prevents the
+      gir-data instructions from running.  Remove this option if the optional
+      <xref linkend="gobject-introspection"/> package is installed.
+    </para>
+
+    <para>
+      <parameter>--disable-gtk-doc-html</parameter>: This prevents the
+      building of the html data.  Remove this option if the optional
+      <xref linkend="gtk-doc"/> package is installed.
+    </para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+
+        <seg>libgudev-1.0.so</seg>
+
+        <seg>/usr/include/gudev-1.0/gudev,
+             /usr/lib/girepository-1.0,
+             /usr/share/gir-1.0, and
+             /usr/share/gtk-doc/html/gudev (optional)</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgudev-1.0-systemd">
+        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
+        <listitem>
+          <para>is a GObject-based wrapper library for libudev.</para>
+          <indexterm zone="udev-extras libgudev-1.0-systemd">
+            <primary sortas="c-libgudev-1.0-systemd">libgudev-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/genlib/genlib.xml
===================================================================
--- general/genlib/genlib.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ general/genlib/genlib.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -70,5 +70,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libcroco.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdaemon.xml"/>
+  <!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libdbusmenuqt.xml"/>
+  -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libesmtp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libffi.xml"/>
@@ -76,4 +78,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgpg-error.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgsf.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgudev.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libgusb.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libical.xml"/>
Index: neral/genlib/libdbusmenuqt.xml
===================================================================
--- general/genlib/libdbusmenuqt.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ 	(revision )
@@ -1,157 +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 libdbusmenu-qt-download-http "http://launchpad.net/libdbusmenu-qt/trunk/&libdbusmenu-qt-version;/+download/libdbusmenu-qt-&libdbusmenu-qt-version;.tar.bz2">
-  <!ENTITY libdbusmenu-qt-download-ftp  " ">
-  <!ENTITY libdbusmenu-qt-md5sum        "9a49484927669cd2ec91b3bf9ba8b79e">
-  <!ENTITY libdbusmenu-qt-size          "37 KB">
-  <!ENTITY libdbusmenu-qt-buildsize     "3.8 MB">
-  <!ENTITY libdbusmenu-qt-time          "0.3 SBU">
-]>
-
-<sect1 id="libdbusmenu-qt" xreflabel="libdbusmenu-qt-&libdbusmenu-qt-version;">
-  <?dbhtml filename="libdbusmenu-qt.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>libdbusmenu-qt-&libdbusmenu-qt-version;</title>
-
-  <indexterm zone="libdbusmenu-qt">
-    <primary sortas="a-libdbusmenu-qt">libdbusmenu-qt</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to libdbusmenu-qt</title>
-
-    <para>This library provides a <application>Qt</application> implementation
-    of the DBusMenu specs, which goal is to expose menus on DBus.</para>
-
-    &lfs77_checked; &gcc5_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&libdbusmenu-qt-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&libdbusmenu-qt-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &libdbusmenu-qt-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &libdbusmenu-qt-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &libdbusmenu-qt-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &libdbusmenu-qt-time;</para>
-      </listitem>
-    </itemizedlist>
-
-<!--
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/libdbusmenu-qt-&libdbusmenu-qt-version;-fixes-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
--->
-    <bridgehead renderas="sect3">libdbusmenu-qt Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-    <xref linkend="qt4"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-    <xref linkend="qjson"/> (for building the test suite) and
-    <xref linkend="doxygen"/> (for building the API documentation)
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/libdbusmenu-qt"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of libdbusmenu-qt</title>
-
-    <para>Install <application>libdbusmenu-qt</application> by running the following
-    commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release  \
-      -DWITH_DOC=OFF .. &amp;&amp;
-make</userinput></screen>
-
-    <para>To test the results
-    (<ulink url="http://qjson.sourceforge.net/">QJson</ulink> must be installed),
-    issue: <command>make -k check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="commands">
-    <title>Command Explanations</title>
-
-    <para><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
-    build without debugging symbols and apply a higher level of compiler 
-    optimizations.</para>
-
-    <para><option>-DWITH_DOC=OFF</option>: This option is set to avoid building
-    the API documentation. Omit it if you have <application>doxygen</application>
-    installed and want the documentation.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directory</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-        <seg>libdbusmenu-qt.so</seg>
-        <seg>&qt4-dir;/include/dbusmenu-qt</seg>
-      </seglistitem>
-    </segmentedlist>
-<!--
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a-automoc4">
-        <term><command>automoc4</command></term>
-        <listitem>
-          <para>is a testing utility for libdbusmenu-qt-generated build trees.</para>
-          <indexterm zone="a-automoc4 automoc4">
-            <primary sortas="b-automoc4">automoc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
-  </sect2>
-
-</sect1>
Index: general/genlib/libgudev.xml
===================================================================
--- general/genlib/libgudev.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
+++ general/genlib/libgudev.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -0,0 +1,169 @@
+<?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 libgudev-download-http
+           "&gnome-download-http;/libgudev/&libgudev-version;/libgudev-&libgudev-version;.tar.xz">
+  <!ENTITY libgudev-download-ftp
+           "&gnome-download-ftp;/libgudev/&libgudev-version;/libgudev-&libgudev-version;.tar.xz">
+  <!ENTITY libgudev-md5sum        "e4dee8f3f349e9372213d33887819a4d">
+  <!ENTITY libgudev-size          "252 KB">
+  <!ENTITY libgudev-buildsize     "3.8 MB">
+  <!ENTITY libgudev-time          "less than 0.1 SBU">
+]>
+
+<sect1 id="libgudev" xreflabel="libgudev-&libgudev-version;">
+  <?dbhtml filename="libgudev.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libgudev-&libgudev-version;</title>
+
+  <indexterm zone="libgudev">
+    <primary sortas="a-libgudev">libgudev</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libgudev</title>
+
+    <para>
+      The <application>libgudev</application> package contains
+      GObject bindings for libudev.
+    </para>
+
+    &lfs77_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libgudev-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libgudev-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libgudev-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libgudev-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libgudev-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libgudev-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+      <xref linkend="glib2"/>
+    </para>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gobject-introspection"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="gtk-doc"/>
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+      <ulink url="&blfs-wiki;/libgudev"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libgudev</title>
+
+    <para>
+      Install <application>libgudev</application> by running
+      the following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
+make</userinput></screen>
+
+    <para>
+      This package does not come with a testsuite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/gtk-doc-rebuild.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Program</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          None
+        </seg>
+        <seg>
+          libgudev-1.0.so
+        </seg>
+        <seg>
+          /usr/include/gudev-1.0 and
+          /usr/share/gtk-doc/html/gudev
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="libgudev-1.0">
+        <term><filename class="libraryfile">libgudev-1.0.so</filename></term>
+        <listitem>
+          <para>
+            is a GObject-based wrapper library for libudev.
+          </para>
+          <indexterm zone="libgudev libgudev-1.0">
+            <primary sortas="c-libgudev-1.0">libgudev-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: general/sysutils/colord.xml
===================================================================
--- general/sysutils/colord.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ general/sysutils/colord.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -92,7 +92,7 @@
     <para role="recommended">
       <xref linkend="gobject-introspection"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="libgusb"/>,
-      <xref linkend="polkit"/>,
-      <xref linkend="udev-extras"/> (for GUdev), and
+      <xref linkend="polkit"/>, and
       <xref linkend="vala"/>
     </para>
Index: general/sysutils/sysutils.xml
===================================================================
--- general/sysutils/sysutils.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ general/sysutils/sysutils.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -45,5 +45,4 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev-extras.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
Index: neral/sysutils/udev-extras.xml
===================================================================
--- general/sysutils/udev-extras.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ 	(revision )
@@ -1,209 +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 eudev-download-http "http://dev.gentoo.org/~blueness/eudev/eudev-&eudev-version;.tar.gz">
-  <!ENTITY eudev-download-ftp  " ">
-  <!ENTITY eudev-md5sum        "80649a0350ff9620fc2da9562d9f2a6a">
-  <!ENTITY eudev-size          "1.7 MB">
-  <!ENTITY eudev-buildsize     "23 MB">
-  <!ENTITY eudev-time          "0.3 SBU">
-
-  <!ENTITY eudev-svn-download-http "http://dev.gentoo.org/~blueness/eudev">
-]>
-
-<sect1 id="udev-extras" xreflabel="udev-extras (from eudev)">
-  <?dbhtml filename="udev-extras.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Udev Extras (from eudev)</title>
-
-  <indexterm zone="udev-extras">
-    <primary sortas="a-udev-extras">udev extras (from eudev)</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Udev Extras</title>
-
-    <para><application>Eudev</application> was indeed installed in LFS and
-    there is no reason to reinstall it unless the user is going to install a
-    package such as <application>UPower</application> that needs libgudev.
-    These instructions enable building libgudev and also optionally create gir
-    data for <application>Eudev</application>.  </para>
-
-    <para>Unlike other packages in BLFS, there is no set version of
-    <application>Eudev</application> in this page's title and no set version
-    specified for download. Version updates to <application>Eudev</application>
-    makes it possible that the user's system may have an
-    <application>Eudev</application> version different from the one in the
-    current LFS book. Therefore, users should use the version of
-    <application>Eudev</application> their computer currently uses. With few
-    exceptions, the BLFS team has no experience updating (or reverting to an
-    older version) the <application>Eudev</application> package <quote>on the
-    fly</quote>.</para>
-
-    &lfs77_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <caution>
-      <para>
-         If you are using a version of BLFS different from your currently
-         installed base LFS system, you should use the Eudev source from your
-         LFS build.  Newer versions of Eudev may occasionally be incompatible
-         with former ones, either because they require some new options to be
-         enabled in the kernel or because they change the way rules are parsed.
-         For in-system updates to Eudev, you may want to consult <ulink
-         url="http:wiki.gentoo.org/wiki/Udev/upgrade">the Gentoo page</ulink>
-         about upgrading Udev. 
-      </para>
-    </caution>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&eudev-svn-download-http;"/></para>
-      </listitem>
-<!--      <listitem>
-        <para>Download (HTTP): <ulink url="&eudev-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&eudev-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &eudev-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &eudev-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &eudev-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &eudev-time;</para>
-      </listitem>-->
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Udev Extras Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="glib2"/>
-    </para>
-
-    <bridgehead renderas="sect4">Optional Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="gobject-introspection"/> (for gir-data, needed for Gnome),
-      <xref linkend="docbook-xsl"/> and <xref linkend="libxslt"/> (to build
-      man pages, which are not shipped with the package), and
-      <xref linkend="gtk-doc"/> (to rebuild the documentation)
-    </para>
-
-    <bridgehead renderas="sect4">Optional Runtime Dependencies</bridgehead>
-    <para role="optional">
-      <xref linkend="pciutils"/> and
-      <xref linkend="usbutils"/>
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/udev-extras"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Udev Extras</title>
-
-    <para>First, re-build eudev:</para>
-
-<screen><userinput>sed -r -i 's|/usr(/bin/test)|\1|'         test/udev-test.pl  &amp;&amp;
-
-./configure --prefix=/usr           \
-            --bindir=/sbin          \
-            --sbindir=/sbin         \
-            --libdir=/usr/lib       \
-            --sysconfdir=/etc       \
-            --libexecdir=/lib       \
-            --with-rootprefix=      \
-            --with-rootlibdir=/lib  \
-            --enable-split-usr      \
-            --enable-libkmod        \
-            --enable-rule_generator \
-            --enable-keymap         \
-            --disable-introspection \
-            --disable-gtk-doc-html  \
-            --disable-static        &amp;&amp;
-
-make</userinput></screen>
-
-   <para>To test the results, issue: <command>make check</command>.</para>
-
-   <para>Now re-install 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>--disable-introspection</parameter>: This prevents the
-      gir-data instructions from running.  Remove this option if the optional
-      <xref linkend="gobject-introspection"/> package is installed.
-    </para>
-
-    <para>
-      <parameter>--disable-gtk-doc-html</parameter>: This prevents the
-      building of the html data.  Remove this option if the optional
-      <xref linkend="gtk-doc"/> package is installed.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/static-libraries.xml"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Library</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>None</seg>
-
-        <seg>libgudev-1.0.so</seg>
-
-        <seg>/usr/include/gudev-1.0/gudev,
-             /usr/lib/girepository-1.0,
-             /usr/share/gir-1.0, and
-             /usr/share/gtk-doc/html/gudev (optional)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libgudev-1.0-systemd">
-        <term><filename class='libraryfile'>libgudev-1.0.so</filename></term>
-        <listitem>
-          <para>is a GObject-based wrapper library for libudev.</para>
-          <indexterm zone="udev-extras libgudev-1.0-systemd">
-            <primary sortas="c-libgudev-1.0-systemd">libgudev-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: general/sysutils/udisks.xml
===================================================================
--- general/sysutils/udisks.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ general/sysutils/udisks.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -78,9 +78,9 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="libatasmart"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="lvm2"/>,
       <xref linkend="parted"/>,
-      <xref linkend="polkit"/>,
-      <xref linkend="sg3_utils"/>, and
-      <xref linkend="udev-extras"/> (for gudev)
+      <xref linkend="polkit"/>, and
+      <xref linkend="sg3_utils"/>
     </para>
 
Index: general/sysutils/udisks2.xml
===================================================================
--- general/sysutils/udisks2.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ general/sysutils/udisks2.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -77,7 +77,7 @@
     <para role="required">
       <xref linkend="libatasmart"/>,
-      <xref linkend="libxslt"/>,
-      <xref linkend="polkit"/>,  and
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="libgudev"/>,
+      <xref linkend="libxslt"/>, and
+      <xref linkend="polkit"/>
     </para>
 
Index: general/sysutils/upower.xml
===================================================================
--- general/sysutils/upower.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ general/sysutils/upower.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -78,7 +78,7 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
-      <xref linkend="libusb"/>,
-      <xref linkend="polkit"/>, and
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="libgudev"/>,
+      <xref linkend="libusb"/>, and
+      <xref linkend="polkit"/>
     </para>
 
Index: gnome/applications/cheese.xml
===================================================================
--- gnome/applications/cheese.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ gnome/applications/cheese.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -93,6 +93,6 @@
       <xref linkend="itstool"/>,
       <xref linkend="libcanberra"/>,
-      <xref linkend="librsvg"/>, and
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="libgudev"/>, and
+      <xref linkend="librsvg"/>
     </para>
 
Index: gnome/platform/gvfs.xml
===================================================================
--- gnome/platform/gvfs.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ gnome/platform/gvfs.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -83,7 +83,7 @@
     <para role="recommended">
       <xref linkend="gtk3"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="libsecret"/>,
-      <xref linkend="libsoup"/>,
-      <xref linkend="udev-extras"/> (for GUdev), and
+      <xref linkend="libsoup"/>, and
       <xref linkend="udisks2"/>
     </para>
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ introduction/welcome/changelog.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -48,4 +48,11 @@
       <para>June 28th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Substitute libgudev for Udev Extras.  Fixes
+          <ulink url="&blfs-ticket-root;6641">#6641</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add KDE Frameworks 5.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to lm_sensors-3.4.0. Fixes
Index: kde/extra-cmake-modules.xml
===================================================================
--- kde/extra-cmake-modules.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ kde/extra-cmake-modules.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -108,5 +108,5 @@
 
     <note><para>
-      Unlike other KF5 packages, this modle is installed in /usr because
+      Unlike other KF5 packages, this module is installed in /usr because
       it can be used by some non-KF5 packages.
     </para></note>
Index: kde/introduction.xml
===================================================================
--- kde/introduction.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ kde/introduction.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -11,8 +11,8 @@
 -->
 
-<chapter id="kde-prereq">
+<chapter id="kde-prereq" xreflabel="Introduction to KDE">
   <?dbhtml filename="introduction.html"?>
 
-  <title>Introduction</title>
+  <title>Introduction to KDE</title>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kde-intro.xml"/>
@@ -21,4 +21,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="phonon-backend-vlc.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="libdbusmenuqt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="extra-cmake-modules.xml"/>
 
Index: kde/kde-intro.xml
===================================================================
--- kde/kde-intro.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ kde/kde-intro.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -14,5 +14,5 @@
   </sect1info>
 
-  <title>Introduction to KDE</title>
+  <title>KDE Preliminaries</title>
 
   <para><application>KDE</application> is a comprehensive desktop environment
Index: kde/kde.xml
===================================================================
--- kde/kde.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ kde/kde.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -14,5 +14,5 @@
   <?dbhtml filename="kde.html" dir="kde"?>
 
-  <title>Introduction to KDE</title>
+  <title>KDE</title>
 <partintro>
   <para><application>KDE</application> is a comprehensive desktop environment
Index: kde/kf5/kf5-frameworks.xml
===================================================================
--- kde/kf5/kf5-frameworks.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
+++ kde/kf5/kf5-frameworks.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -0,0 +1,446 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+
+  <!ENTITY kf5-download-http "&kf5-download-http;">
+  <!ENTITY kf5-download-ftp  "&kf5e-download-ftp;">
+  <!ENTITY kf5-md5sum        "See Below">
+  <!ENTITY kf5-size          "30 MB">
+  <!ENTITY kf5-buildsize     "1.0 GB">
+  <!ENTITY kf5-time          "38 SBU">
+]>
+
+<sect1 id="kf5-frameworks" xreflabel="KDE Frameworks &kf5-version;">
+  <?dbhtml filename="krameworks5.html"?>
+
+  <sect1info>
+     <othername>$LastChangedBy: bdubbs $</othername>
+     <date>$Date: 2015-06-26 14:39:08 -0500 (Fri, 26 Jun 2015) $</date>
+  </sect1info>
+
+  <title>Building KDE Frameworks 5 (KF5)</title>
+
+  <indexterm zone="kf5">
+     <primary sortas="a-kf5">KDE Frameworks</primary>
+  </indexterm>
+
+  <para>KDE Frameworks 5 is a collection of libraries based on top of Qt5 and
+  QML derived from the monolithic KDE 4 libraries. They can be used
+  independent of the KDE Display Environment (Plasma 5).</para>
+
+  &lfs77_checked; &gcc5_checked;
+
+  <para>The instructions below build all of the KDE Frameworks packages in one
+  step by using a bash script.  </para>
+
+  <bridgehead renderas="sect3">Package Information</bridgehead>
+  <itemizedlist spacing="compact">
+    <listitem>
+      <para>Download (HTTP): <ulink url="&kf5-download-http;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download (FTP): <ulink url="&kf5-download-ftp;"/></para>
+    </listitem>
+    <listitem>
+      <para>Download MD5 sum: &kf5-md5sum;</para>
+    </listitem>
+    <listitem>
+      <para>Download size: &kf5-size;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated disk space required: &kf5-buildsize;</para>
+    </listitem>
+    <listitem>
+      <para>Estimated build time: &kf5-time;</para>
+    </listitem>
+  </itemizedlist>
+
+  <bridgehead renderas="sect3">KF5 Dependencies</bridgehead>
+
+  <bridgehead renderas="sect4">Required</bridgehead>
+  <para role="required">
+    <xref linkend="boost"/>,
+    <xref linkend="extra-cmake-modules"/>,
+    <xref linkend="DocBook"/>,
+    <xref linkend="docbook-xsl"/>,
+    <xref linkend="giflib"/>,
+    <xref linkend="libepoxy"/>,
+    <xref linkend="libgcrypt"/>,
+    <xref linkend="libjpeg"/>,
+    <xref linkend="libpng"/>,
+    <xref linkend="libxslt"/>,
+    <xref linkend="phonon"/> (built with qt5),
+    <xref linkend="shared-mime-info"/>, and
+    <xref linkend="wget"/> (required to download the packages)
+  </para>
+
+  <bridgehead renderas="sect4">Recommended</bridgehead>
+  <para role="recommended">
+    <xref linkend="avahi"/> (DNS-SD backend for KDNSSD),
+    <xref linkend="aspell"/> (Dictionary backend for Sonnet),
+    <xref linkend="libdbusmenu-qt"/> (built with qt5), and 
+    <xref linkend="polkit-qt"/> (Authentication backend for KAuth)
+  </para>
+
+  <bridgehead renderas="sect4">Optional</bridgehead>
+  <para role="optional">
+    <xref linkend="bluez"/> (needed to build Bluez-Qt),
+    <xref linkend="NetworkManager"/> (needed to build NetworkManager-Qt),
+    <ulink url="http://www.freedesktop.org/software/ModemManager/">ModemManager</ulink> (needed to build ModemManager-Qt)
+  </para>
+
+  <bridgehead renderas="sect4">Runtime dependency for FrameworkIntegration</bridgehead>
+  <para role="optional">
+    <ulink url="http://download.kde.org/stable/plasma/5.2.0">oxygen-fonts</ulink>
+  </para>
+
+  <bridgehead renderas="sect4">Runtime dependencies for kapidox</bridgehead>
+  <para role="optional">
+    <xref linkend="doxygen"/>,
+    <ulink url="https://pypi.python.org/packages/source/J/Jinja2/">Jinja2</ulink>, and
+    <ulink url="http://pyyaml.org/">PyYAML</ulink>
+  </para>
+
+  <bridgehead renderas="sect4">Additional image formats support in KImageFormats</bridgehead>
+  <para role="optional">
+    <xref linkend="jasper"/> and
+    <ulink url="http://www.openexr.com/">OpenEXR</ulink>
+  </para>
+
+  <bridgehead renderas="sect4">Optional dependencies for KIO</bridgehead>
+  <para role="optional">
+    <xref linkend="mitkrb"/>
+  </para>
+
+  <bridgehead renderas="sect4">Optional dependencies for ModemManager-QT</bridgehead>
+  <para role="optional">
+    <ulink url="http://www.freedesktop.org/software/ModemManager/">ModemManager</ulink>
+  </para>
+
+  <bridgehead renderas="sect4">Optional dependencies for Solid</bridgehead>
+  <para role="optional">
+    <xref linkend="udisks2"/>,
+    <xref linkend="upower"/> and
+    <ulink url="http://www.freedesktop.org/software/media-player-info/">media-player-info</ulink> (runtime)
+  </para>
+
+  <bridgehead renderas="sect4">Optional dictionary backends for Sonnet</bridgehead>
+  <para role="optional">
+    <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink> and
+    <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
+  </para>
+
+  <para condition="html" role="usernotes">User Notes:
+  <ulink url="&blfs-wiki;/kf5"/></para>
+
+  <sect2>
+    <title>Downloading KDE Frameworks</title>
+
+    <para>
+      The easiest way to get the KDE Frameworks packages is to use a single
+      <command>wget</command> to fetch them all at once:
+    </para>
+ 
+<screen><userinput>url=http://download.kde.org/stable/frameworks/&kf5-short-version;/
+wget -r -nH --cut-dirs=3 -A '*.xz' -np $url
+<literal>
+The options used here are: 
+  -r            recurse through child directories
+  -nH           disable generation of host-prefixed directories
+  --cut-dirs=3  remove three levels of directories when saving
+  -A '*.xz'     just get the *.xz files
+  -np           don't get parent directories</literal></userinput></screen>
+
+   </sect2>
+
+  <sect2>
+    <title>Setting Package Order</title>
+
+    <para>
+      The order of building files is important due to internal dependencies.
+      Create the list of files in the proper order as follows:
+    </para>
+
+<screen><userinput>cat &gt; frameworks-&kf5-version;.md5 &lt;&lt; "EOF"
+<literal>cf34c6fa2dcad71300592dd393920ff4  attica-5.11.0.tar.xz
+#0e1298c6fce735f06c789a173c0093ff  extra-cmake-modules-5.11.0.tar.xz
+1ebfcf3d9ae51024ea619a31de30adbd  kapidox-5.11.0.tar.xz
+a9044a93fc88324d97108d69b07f7851  karchive-5.11.0.tar.xz
+5cfbb6836dbbdeddef9d889cf824f1bd  kcodecs-5.11.0.tar.xz
+ecd6f03aa5e0bdcfa1a9b17ce1654afe  kconfig-5.11.0.tar.xz
+1d17806d243683ac89c95352f82b0da3  kcoreaddons-5.11.0.tar.xz
+4c40d991d4c96bc128dd7b31449951ea  kdbusaddons-5.11.0.tar.xz
+765ee80403c552e07cb96aa033c9377d  kdnssd-5.11.0.tar.xz
+9829e1689fa1ee9e64679e68c5f096d1  kguiaddons-5.11.0.tar.xz
+a6bd7a449ccfbbab1a3e400d984ceabe  ki18n-5.11.0.tar.xz
+d3d51e235dc56f164c79dc4ebc9feb3e  kidletime-5.11.0.tar.xz
+ebae895f7e81640d183407810c9f04a4  kimageformats-5.11.0.tar.xz
+2021d6412691454b794c7929e1f80c17  kitemmodels-5.11.0.tar.xz
+4087b80ec96386348da894e1dbd5839b  kitemviews-5.11.0.tar.xz
+9c1ba124260ae24f8de606440eefd623  kplotting-5.11.0.tar.xz
+6e5d05a5cd7f735ad9832e93c2693ea2  kwidgetsaddons-5.11.0.tar.xz
+aa8a829b16e4821c12f742aea0476eff  kwindowsystem-5.11.0.tar.xz
+#ccfb2950c7ae9a1022aba4fa4eb5d5a2  networkmanager-qt-5.11.0.tar.xz
+3be0e15864f99da1419d957c2933a8c7  solid-5.11.0.tar.xz
+6359c0e401d2c08cdb763bb35f14af75  sonnet-5.11.0.tar.xz
+5ffac7ee80aa144de5719cae044878b0  threadweaver-5.11.0.tar.xz
+44f96e75953fb3e66ecefc21ffc3b3ff  kauth-5.11.0.tar.xz
+b09b9d9e5856f21fb6fedcbcd9719c4f  kcompletion-5.11.0.tar.xz
+405d9660150c84695373c1c323326a98  kcrash-5.11.0.tar.xz
+78e56f2cc33d4e8443339e87fec3571b  kdoctools-5.11.0.tar.xz
+5cce7e6e758e6456455ea57cbb016b33  kpty-5.11.0.tar.xz
+80bbcfc184a8fa6a1664be4719966974  kunitconversion-5.11.0.tar.xz
+91e25767cadb56b3894ebfff045f7a21  kconfigwidgets-5.11.0.tar.xz
+bbdc7503aa7bb3d7be82a5a206520c97  kglobalaccel-5.11.0.tar.xz
+f8b4e91bee1edc6abfa1407b160d29d5  kpackage-5.11.0.tar.xz
+fe3138bc70494f0da6e6ea6317141860  kservice-5.11.0.tar.xz
+00fb63ff7de44bcec9a408b8a1d0f2d5  kdesu-5.11.0.tar.xz
+233e21ccdb6c144c68365aac0c36569f  kemoticons-5.11.0.tar.xz
+de00d3065870c1b2c6d42dff806d44d7  kiconthemes-5.11.0.tar.xz
+5dad6d5e6d3d1740d9f10ca05e58c721  kjobwidgets-5.11.0.tar.xz
+40435109ce5d9384aaf87d09396cdb4c  knotifications-5.11.0.tar.xz
+8bf33798f1a0c2099d32ff62adb20ed4  ktextwidgets-5.11.0.tar.xz
+15bd67e33adc2fce5fdabb580b4a408a  kwallet-5.11.0.tar.xz
+057915802467acb7c6b5cb71a38a021a  kxmlgui-5.11.0.tar.xz
+65100bbdf0f80c21e3f7c25e781fa483  kbookmarks-5.11.0.tar.xz
+317bfc7cb41abbaa24f257beceb76501  kio-5.11.0.tar.xz
+ac8cc22f3e7f210e510ce75e1e606412  kdeclarative-5.11.0.tar.xz
+9867fe7fb968cec64265ce59067a8d7e  kcmutils-5.11.0.tar.xz
+81cb1261454ed337366661d18841b205  frameworkintegration-5.11.0.tar.xz
+9cfef5918e21d8c539464f9e67bd7055  kinit-5.11.0.tar.xz
+bcdb6bee371fe46abaff58993f39544d  knewstuff-5.11.0.tar.xz
+9c57e87d0f13e8bd0e49782b58716b12  knotifyconfig-5.11.0.tar.xz
+497e746e8c9c05b50d21e6a6e3541470  kparts-5.11.0.tar.xz
+76be53547d8ffc7b0ab34547c3ef3d15  kactivities-5.11.0.tar.xz
+193f5cfaded513da333a83b5acca3b35  kded-5.11.0.tar.xz
+e5186e68ec0afca81ef8248b5a15b8cc  kdewebkit-5.11.0.tar.xz
+002fa8c6862fc2e59d14fad1a2feb6cb  ktexteditor-5.11.0.tar.xz
+5267dd2cd57ca07d319238a1946e32f2  kdesignerplugin-5.11.0.tar.xz
+de179500e7536dadd33a4b4b3a5f9ed1  plasma-framework-5.11.0.tar.xz
+#7527cfdc8aa93e1ada1ebb765d90ab22  modemmanager-qt-5.11.0.tar.xz
+2f67512dc135ee4f9c87ddb2b02a6e9e  kpeople-5.11.0.tar.xz
+a0fcb3c4d99209a46076ecf084b44fd9  kxmlrpcclient-5.11.0.tar.xz
+#909827fc26098c7b4ab48c7228801e16  bluez-qt-5.11.0.tar.xz
+51ae529769e7e8566de5c542f264bde2  portingAids/kjs-5.11.0.tar.xz
+9a9dbbd563af37470665bef96813b495  portingAids/kdelibs4support-5.11.0.tar.xz
+2f41b63b227759650cd1fca3f8bbfc73  portingAids/khtml-5.11.0.tar.xz
+dee5aff4f8b0eaf30a0fc5f572086fe7  portingAids/kjsembed-5.11.0.tar.xz
+cd11941765848e298327a1d91dc0377b  portingAids/kmediaplayer-5.11.0.tar.xz
+8bbc29287684b127280a54e620800a96  portingAids/kross-5.11.0.tar.xz
+a59141c3aaa3e9f8f846082a9c1c78b9  portingAids/krunner-5.11.0.tar.xz</literal>
+EOF</userinput></screen>
+
+  <para>In the above list, notice that three files have been commented out with
+  a hash (#) character. The extra-cmake-modules entry has been commented out
+  because it was built earlier in the <xref linkend="kde-prereq"/>. The
+  others may be built if the optional dependencies have been installed.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of KDE Frameworks</title>
+
+    &as_root;
+
+    <caution>
+      <para>If inatalling in /opt and there is an existing /opt/kf5 either as a
+      regular directory or a symbolic link, it should be removed (as root):</para>
+
+      <screen><userinput>rm -rf /opt/kf5</userinput></screen>
+    </caution>
+
+    <para>
+      First, start a subshell that will exit on error:
+    </para>
+
+
+<screen><userinput>bash -e</userinput></screen>
+
+    <para>
+      Install all of the packages by running the following
+      commands:
+    </para>
+
+<screen><userinput>while read -r line; do
+
+    # Get the file name, ignoring comments and blank lines
+    if $(echo $line | grep -E -q '^ *$|^#' ); then continue; fi
+    file=$(echo $line | cut -d" " -f2)
+    
+    pkg=$(echo $file|sed 's|^.*/||')          # Remove directory
+    packagedir=$(echo $pkg|sed 's|\.tar.*||') # Package directory
+
+    tar -xf $file
+    pushd $packagedir
+
+      mkdir build
+      cd    build
+
+      cmake -DCMAKE_INSTALL_PREFIX=$KF5_PREFIX \
+            -DCMAKE_PREFIX_PATH=$QT5_PREFIX    \
+            -DCMAKE_BUILD_TYPE=Release         \
+            -DLIB_INSTALL_DIR=lib              \
+            -DBUILD_TESTING=OFF                \
+            -Wno-dev .. 
+      make
+      as_root make install
+  popd
+
+  rm -rf $packagedir
+  as_root /sbin/ldconfig
+
+done &lt; frameworks-&kf5-version;.md5
+
+exit</userinput></screen>
+
+    <note><para>Any modules that have been omitted can be installed later by
+    using the same mkdir build; cd build; cmake; make; make install procedure
+    as above.</para></note>
+
+    <para>Sometimes the installation paths are hardcoded into installed files.
+    If the installed directory is not /usr, rename the directory and create a
+    symlink:</para>
+    
+    <screen><userinput>mv /opt/kf5 kf5-&kf5-version;
+ln -sfvn kf5-&kf5-version; /opt/kf5</userinput></screen>
+
+  </sect2>
+
+    <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <para>
+      <parameter>-DCMAKE_PREFIX_PATH=$QT5_PREFIX</parameter>: This switch is used
+      to allow cmake to find the proper Qt libraries.
+    </para>
+
+    <para>
+      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
+      to apply higher level of the compiler optimizations.
+    </para>
+
+    <para>
+      <parameter>-DLIB_INSTALL_DIR=lib</parameter>: This switch is used
+      to get libraries to install to <filename
+      class="directory">$KF5_PREFIX/lib</filename> instead of <filename
+      class="directory">$KF5_PREFIX/lib64</filename> on a 64 bit system.
+    </para>
+
+    <para>
+      <parameter>-DBUILD_TESTING=OFF</parameter>: This switch is used to prevent
+      building test programs and libraries that are of no use to an end user.
+    </para>
+
+  </sect2>
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Libraries</segtitle>
+      <segtitle>Installed Directories</segtitle>
+
+      <seglistitem>
+        <seg>
+          checkXML5, depdiagram-generate, depdiagram-generate-all, depdiagram-prepare,
+          desktoptojson, kactivitymanagerd, kbuildsycoca5, kconfig_compiler_kf5,
+          kcookiejar5, kdebugdialog5, kded5, kdeinit5, kdeinit5_shutdown, kdeinit5_wrapper,
+          kf5-config, kf5kross, kgenapidox, kgendesignerplugin, genframeworksapidox,
+          kglobalaccel5, kiconfinder5, kjs5, kjscmd5, kjsconsole, kmailservice5,
+          kpackagelauncherqml, kpackagetool5, kquitapp5, kreadconfig5, kshell5,
+          ktelnetservice5, ktrash5, kwalletd5, kwrapper5, kwriteconfig5, meinproc5,
+          plasmapkg2, preparetips5, and solid-hardware5
+        </seg>
+        <seg>
+          libkdeinit5_kded5.so, libkdeinit5_klauncher.so, libKF5Activities.so,
+          libKF5Archive.so, libKF5Attica.so, libKF5Auth.so, libKF5BluezQt.so,
+          libKF5Bookmarks.so, libKF5Codecs.so, libKF5Completion.so,
+          libKF5ConfigCore.so, libKF5ConfigGui.so, libKF5ConfigWidgets.so,
+          libKF5CoreAddons.so, libKF5Crash.so, libKF5DBusAddons.so,
+          libKF5Declarative.so, libKF5DNSSD.so, libKF5Emoticons.so,
+          libKF5GlobalAccelPrivate.so, libKF5GlobalAccel.so, libKF5GuiAddons.so,
+          libKF5I18n.so, libKF5IconThemes.so, libKF5IdleTime.so,
+          libKF5ItemModels.so, libKF5ItemViews.so, libKF5JobWidgets.so, libKF5JSApi.so,
+          libKF5JsEmbed.so, libKF5JS.so, libKF5KCMUtils.so, libKF5KDELibs4Support.so,
+          libKF5KHtml.so, libKF5KIOCore.so, libKF5KIOFileWidgets.so, libKF5KIONTLM.so,
+          libKF5KIOWidgets.so, libKF5KrossCore.so, libKF5KrossUi.so, libKF5MediaPlayer.so,
+          libKF5ModemManagerQt.so, libKF5NetworkManagerQt.so, libKF5NewStuff.so,
+          libKF5Notifications.so, libKF5NotifyConfig.so, libKF5Package.so,
+          libKF5Parts.so, libKF5PeopleBackend.so, libKF5People.so,
+          libKF5PeopleWidgets.so, libKF5PlasmaQuick.so, libKF5Plasma.so,
+          libKF5Plotting.so, libKF5Pty.so, libKF5QuickAddons.so, libKF5Runner.so,
+          libKF5Service.so, libKF5Solid.so, libKF5SonnetCore.so, libKF5SonnetUi.so,
+          libKF5Style.so, libKF5Su.so, libKF5TextEditor.so, libKF5TextWidgets.so,
+          libKF5ThreadWeaver.so, libKF5UnitConversion.so, libKF5Wallet.so,
+          libKF5WebKit.so, libKF5WidgetsAddons.so, libKF5WindowSystem.so,
+          libKF5XmlGui.so, libKF5XmlRpcClient.so, libKF5XsltKde.a, and
+          libkwalletbackend5.so
+        </seg>
+        <seg>
+          $KF5_PREFIX/include/KF5/{Attica,BluezQt,KActivities,KArchive,KAuth},
+          $KF5_PREFIX/include/KF5/{KBookmarks,KCMUtils,KCodecs,KCompletion},
+          $KF5_PREFIX/include/KF5/{KConfigCore,KConfigGui,KConfigWidgets,KCoreAddons},
+          $KF5_PREFIX/include/KF5/{KCrash,KDBusAddons,KDeclarative,KDELibs4Support},
+          $KF5_PREFIX/include/KF5/{KDESu,KDEWebKit,KDNSSD,KEmoticons,KGlobalAccel},
+          $KF5_PREFIX/include/KF5/{KGuiAddons,KHtml,KI18n,KIconThemes,KIdleTime},
+          $KF5_PREFIX/include/KF5/{kio,KIOCore,KIOFileWidgets,KIOWidgets},
+          $KF5_PREFIX/include/KF5/{KItemModels,KItemViews,KJobWidgets,kjs,KJsEmbed},
+          $KF5_PREFIX/include/KF5/{KMediaPlayer,KNewStuff3,KNotifications},
+          $KF5_PREFIX/include/KF5/{KNotifyConfig,KPackage,KParts,KPeople,KPlotting},
+          $KF5_PREFIX/include/KF5/{KPty,KrossCore,KrossUi,KRunner,KService,KStyle},
+          $KF5_PREFIX/include/KF5/{KTextEditor,KTextWidgets,KUnitConversion,KWallet},
+          $KF5_PREFIX/include/KF5/{KWidgetsAddons,KWindowSystem,KXmlGui},
+          $KF5_PREFIX/include/KF5/{KXmlRpcClient,ModemManagerQt,NetworkManagerQt},
+          $KF5_PREFIX/include/KF5/{plasma,Plasma,Solid,SonnetCore},
+          $KF5_PREFIX/include/KF5/{SonnetUi,ThreadWeaver,wtf,XsltKde},
+          $KF5_PREFIX/lib/cmake/{KDED,KDELibs4,KF5Activities,KF5Archive,KF5Attica},
+          $KF5_PREFIX/lib/cmake/{KF5Auth,KF5BluezQt,KF5Bookmarks,KF5Codec},
+          $KF5_PREFIX/lib/cmake/{KF5Completion,KF5Config,KF5ConfigWidgets},
+          $KF5_PREFIX/lib/cmake/{KF5CoreAddons,KF5Crash,KF5DBusAddons},
+          $KF5_PREFIX/lib/cmake/{KF5Declarative,KF5DesignerPlugin,KF5DNSSD},
+          $KF5_PREFIX/lib/cmake/{KF5DocTools,KF5Emoticons,F5FrameworkIntegration},
+          $KF5_PREFIX/lib/cmake/{KF5GlobalAccel,KF5GuiAddons,KF5I18n},
+          $KF5_PREFIX/lib/cmake/{KF5IconThemes,KF5IdleTime,KF5Init},
+          $KF5_PREFIX/lib/cmake/{KF5ItemModels,KF5ItemViews,KF5JobWidgets},
+          $KF5_PREFIX/lib/cmake/{KF5JS,KF5JsEmbed,KF5KCMUtils},
+          $KF5_PREFIX/lib/cmake/{KF5KDE4Support,KF5KDELibs4Support},
+          $KF5_PREFIX/lib/cmake/{KF5KHtml,KF5KIO,KF5Kross,KF5MediaPlayer},
+          $KF5_PREFIX/lib/cmake/{KF5ModemManagerQt,KF5NetworkManagerQt,KF5NewStuff},
+          $KF5_PREFIX/lib/cmake/{KF5Notifications,KF5NotifyConfig,KF5Package},
+          $KF5_PREFIX/lib/cmake/{KF5Parts,KF5People,KF5Plasma,KF5PlasmaQuick},
+          $KF5_PREFIX/lib/cmake/{KF5Plotting,KF5Pty,KF5Runner,KF5Service},
+          $KF5_PREFIX/lib/cmake/{KF5Solid,KF5Sonnet,KF5Su,KF5TextEditor},
+          $KF5_PREFIX/lib/cmake/{KF5TextWidgets,KF5ThreadWeaver},
+          $KF5_PREFIX/lib/cmake/{KF5UnitConversion,KF5Wallet,KF5WebKit},
+          $KF5_PREFIX/lib/cmake/{KF5WidgetsAddons,KF5WindowSystem,KF5XmlGui},
+          $KF5_PREFIX/lib/cmake/KF5XmlRpcClient,
+          $KF5_PREFIX/lib/libexec/{kauth,kf5},
+          $KF5_PREFIX/lib/python&python2-majorver;/site-packages/kapidox,
+          $KF5_PREFIX/lib/qt5/{designer,imageformats,kactivitymanagerd},
+          $KF5_PREFIX/lib/qt5/{kauth,kf5,org.kde.kglobalaccel5.platforms},
+          $KF5_PREFIX/lib/qt5/{plasma,platformthemes,script},
+          $KF5_PREFIX/lib/qml/org/kde/{activities,bluezqt,draganddrop},
+          $KF5_PREFIX/lib/qml/org/kde/{kcoreaddons,kio,kquickcontrols},
+          $KF5_PREFIX/lib/qml/org/kde/{kquickcontrolsaddons,kwindowsystem},
+          $KF5_PREFIX/lib/qml/org/kde/{people,plasma,private,runnermodel},
+          $KF5_PREFIX/lib/qml/org/kde/solid,
+          $KF5_PREFIX/lib/qml/QtQuick/Controls/Styles/Plasma,
+          $KF5_PREFIX/share/doc/HTML/*/{kdebugdialog5,kdoctools5-common,kioslave5},
+          $KF5_PREFIX/share/emoticons/Glass,
+          $KF5_PREFIX/share/{katepart5,knotifications5,kservices5,kservicetypes5},
+          $KF5_PREFIX/share/kf5/{infopage,kactivitymanagerd,kauth,kcharselect},
+          $KF5_PREFIX/share/kf5/{kconfigwidgets,kcookiejar,kdoctools,khtml,kjava},
+          $KF5_PREFIX/share/kf5/{kjs,kmoretools,knewstuff,kpeople,kssl,kxmlgui},
+          $KF5_PREFIX/share/kf5/{locale,sonnet,widgets},
+          $KF5_PREFIX/share/kxmlgui5/{katepart,khtml}i, and
+          $KF5_PREFIX/share/plasma/{desktoptheme,services}
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+  </sect2>
+
+</sect1>
+
Index: kde/kf5/kf5-intro.xml
===================================================================
--- kde/kf5/kf5-intro.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
+++ kde/kf5/kf5-intro.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+
+  <!ENTITY kf5-download-http "&kf5-download-http;">
+  <!ENTITY kf5-download-ftp  "&kf5e-download-ftp;">
+  <!ENTITY kf5-md5sum        "See Below">
+  <!ENTITY kf5-size          "30 MB">
+  <!ENTITY kf5-buildsize     "11.7 MB">
+  <!ENTITY kf5-time          "0.4 SBU">
+]>
+
+<sect1 id="kf5-intro" xreflabel="Introduction to KF5">
+  <?dbhtml filename="kf5-intro.html"?>
+
+  <sect1info>
+     <othername>$LastChangedBy: bdubbs $</othername>
+     <date>$Date: 2015-06-26 14:39:08 -0500 (Fri, 26 Jun 2015) $</date>
+  </sect1info>
+
+  <title>KDE Frameworks 5 Pre-installation Configuration</title>
+
+  <indexterm zone="kf5">
+     <primary sortas="a-kf5">KDE Frameworks</primary>
+  </indexterm>
+
+  <para>KF5 can be installed in /usr or /opt/kf5.  The BLFS editors
+  recommend the later in the BLFS environment.
+  </para>
+
+  <sect2>
+    <title>Installing in /usr</title>
+
+    <para>
+      One option is to install <application>KDE Frameworks 5</application>
+      into the <filename class="directory">/usr</filename> hierarchy.
+      This creates a simpler setup but makes it more difficult to try
+      multiple versions of <application>KDE Frameworks</application>.
+    </para>
+
+<screen><userinput>export KF5_PREFIX=/usr</userinput></screen>
+
+    <para>
+      It is a good idea to add the following variables to your
+      system or personal profile:
+    </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/kf5.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/kf5.sh
+
+export KF5_PREFIX=/usr
+
+pathappend /usr/lib/qt5/plugins    QT_PLUGIN_PATH
+pathappend $QT5DIR/lib/qt5/plugins QT_PLUGIN_PATH
+
+pathappend /usr/lib/qt5/qml        QML_IMPORT_PATH
+pathappend $QT5DIR/lib/qt5/qml     QML_IMPORT_PATH
+
+pathappend /usr/lib/qt5/qml        QML2_IMPORT_PATH
+pathappend $QT5DIR/lib/qt5/qml     QML2_IMPORT_PATH
+
+# End /etc/profile.d/kf5.sh</literal>
+EOF
+
+cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
+<literal># Begin Qt5 changes for KF5
+
+pathappend $QT5DIR/lib/qt5/plugins  QT_PLUGIN_PATH
+pathappend $QT5DIR/lib/qt5/qml      QML_IMPORT_PATH
+pathappend $QT5DIR/lib/qt5/qml      QML2_IMPORT_PATH
+
+# End Qt5 changes for KF5</literal>
+EOF</userinput></screen>
+    <warning>
+      <para>
+        If <application>KDE4</application> is installed in
+        <filename class="directory">/usr</filename>, some packages
+        from this chapter might overwrite some programs installed
+        by <application>KDE4</application> packages.
+      </para>
+    </warning>
+
+  </sect2>
+
+  <sect2>
+    <title>Installing in /opt</title>
+
+    <para>
+      A method of building multiple versions installs
+      <application>KDE Frameworks 5</application> in the
+      <filename class="directory">/opt</filename> hierarchy:
+    </para>
+
+<screen><userinput>export KF5_PREFIX=/opt/kf5</userinput></screen>
+
+    <para>
+      If you are not installing <application>KDE Frameworks 5</application>
+      in <filename class="directory">/usr</filename>, you will need to
+      make some additional configuration changes. Best practice is to add
+      those to your system or personal profile:
+    </para>
+
+<screen role="root"><userinput>cat &gt; /etc/profile.d/kf5.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/kf5.sh
+
+export KF5_PREFIX=/opt/kf5
+
+pathappend $KF5_PREFIX/bin             PATH
+pathappend $KF5_PREFIX/lib/pkgconfig   PKG_CONFIG_PATH
+
+pathappend /etc/xdg                    XDG_CONFIG_DIRS
+pathappend $KF5_PREFIX/etc/xdg         XDG_CONFIG_DIRS
+pathappend /usr/share                  XDG_DATA_DIRS
+pathappend $KF5_PREFIX/share           XDG_DATA_DIRS
+
+pathappend /usr/lib/qt5/plugins        QT_PLUGIN_PATH
+pathappend $KF5_PREFIX/lib/plugins     QT_PLUGIN_PATH
+
+pathappend /usr/lib/qt5/qml            QML_IMPORT_PATH
+pathappend $KF5_PREFIX/lib/qml         QML_IMPORT_PATH
+
+pathappend /usr/lib/qt5/qml            QML2_IMPORT_PATH
+pathappend $KF5_PREFIX/lib/qml         QML2_IMPORT_PATH
+
+pathappend $KF5_PREFIX/lib/python&python2-majorver;/site-packages PYTHONPATH
+# End /etc/profile.d/kf5.sh</literal>
+EOF
+
+cat &gt; /etc/profile.d/qt5.sh &lt;&lt; "EOF"
+<literal># Begin /etc/profile.d/kf5.sh
+# Begin Qt5 changes for KF5
+
+pathappend $QT5DIR/plugins             QT_PLUGIN_PATH
+pathappend $QT5DIR/qml                 QML_IMPORT_PATH
+pathappend $QT5DIR/qml                 QML2_IMPORT_PATH
+
+# End Qt5 changes for KF5</literal>
+EOF</userinput></screen>
+
+    <para>
+      Expand your <filename>/etc/ld.so.conf</filename> file:
+    </para>
+
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
+<literal># Begin KF5 addition
+
+/opt/kf5/lib
+
+# End KF5 addition</literal>
+EOF</userinput></screen>
+
+    <indexterm zone="kf5-intro">
+      <primary sortas="e-etc-ld.so.conf">/etc/ld.so.conf</primary>
+    </indexterm>
+
+    <para>
+      Several <application>KDE Frameworks 5</application> packages install
+      files into <application>D-Bus</application> directories. When installing
+      <application>KDE Frameworks 5</application> in a location other than
+      <filename class="directory">/usr</filename>,
+      <application>D-Bus</application> needs to be able to find these files.
+      The easiest way to achieve this is to create the following symlinks (as
+      the <systemitem class="username">root</systemitem> user):
+    </para>
+
+<screen role="root"><userinput>install -v -dm755           $KF5_PREFIX/{etc,share} &amp;&amp;
+ln -sfv /etc/dbus-1         $KF5_PREFIX/etc         &amp;&amp;
+ln -sfv /usr/share/dbus-1   $KF5_PREFIX/share</userinput></screen>
+
+    <para>
+      Some packages may also install icons from the "hicolor" icon set. Since that
+      icon set is used by many packages, it is a good idea to create a
+      symlink to the one in <filename class="directory">/usr/share</filename>
+      to avoid having multiple installations of <xref linkend="hicolor-icon-theme"/>.
+      Run the following commands as the <systemitem class="username">root</systemitem>
+      user:
+    </para>
+
+<screen role="root"><userinput>install -v -dm755                $KF5_PREFIX/share/icons &amp;&amp;
+ln -sfv /usr/share/icons/hicolor $KF5_PREFIX/share/icons</userinput></screen>
+
+    <tip>
+      <para>
+        Sometimes, the installation paths are hardcoded into installed files.
+        This is the reason why <filename class="directory">/opt/kf5</filename>
+        is used as installation prefix instead of <filename
+        class="directory">/opt/kf5-&kf5-version;</filename>. After installing
+        <application>KDE Frameworks</application>, you may rename the directory
+        and create a symlink:
+      </para>
+
+<screen role="root"><userinput>mv /opt/kf5{,-&kf5-version;}
+ln -sfv kf5-&kf5-version; /opt/kf5</userinput></screen>
+
+      <para>
+        Later on, you may want to install other versions of
+        <application>KDE Frameworks 5</application>. To do that, just remove
+        the symlink and use <filename class="directory">/opt/kf5</filename>
+        as the prefix again. Which version of
+        <application>KDE Frameworks 5</application> you use depends only on
+        where the symlink points. No other reconfiguration will be needed.
+      </para>
+    </tip>
+
+  </sect2>
+
+</sect1>
+
+
Index: kde/kf5/kf5.xml
===================================================================
--- kde/kf5/kf5.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ kde/kf5/kf5.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -7,15 +7,15 @@
 
 <!--
-$LastChangedBy: rthomsen $
-$Date: 2014-09-10 14:10:00 -0500 (Wed, 10 Sep 2014) $
+$LastChangedBy: bdubbs $
+$Date: 2015-06-24 18:03:07 -0500 (Wed, 24 Jun 2015) $
 -->
 
 <chapter id="kf5">
   <?dbhtml filename="kf5.html"?>
+ 
+  <title>KDE Frameworks 5</title>
 
-  <title>KDE Frameworks 5 (KF5)</title>
- 
-  <para>Placeholder</para>
-
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-intro.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kf5-frameworks.xml"/>
 
 </chapter>
Index: e/kf5/phonon5.xml
===================================================================
--- kde/kf5/phonon5.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ 	(revision )
@@ -1,171 +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 phonon-download-http "&kde-download-http;phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
-  <!ENTITY phonon-download-ftp  "&kde-download-ftp;phonon/&phonon-version;/src/phonon-&phonon-version;.tar.xz">
-  <!ENTITY phonon-md5sum        "88bb9867261803eed61ff53a7c026338">
-  <!ENTITY phonon-size          "316 KB">
-  <!ENTITY phonon-buildsize     "11.7 MB">
-  <!ENTITY phonon-time          "0.4 SBU">
-]>
-
-<sect1 id="phonon5" xreflabel="phonon-&phonon-version; (Qt5)">
-  <?dbhtml filename="phonon5.html"?>
-
-  <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
-  </sect1info>
-
-  <title>Phonon-&phonon-version; (Qt5)</title>
-
-  <indexterm zone="phonon5">
-    <primary sortas="a-phonon5">phonon</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title>Introduction to Phonon (Qt5)</title>
-
-    <para><application>Phonon</application> is the multimedia API for KDE5.
-    This is the same version of Phonon used in KDE4, but must be linked
-    usign Qt5 libraries.
-    Phonon needs either the GStreamer or VLC backend.</para>
-
-    &lfs77_checked; &gcc5_checked;
-
-    <bridgehead renderas="sect3">Package Information</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download (HTTP): <ulink url="&phonon-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&phonon-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &phonon-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &phonon-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &phonon-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &phonon-time;</para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Phonon Dependencies</bridgehead>
-
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="cmake"/>,
-      <xref linkend="glib2"/>, and
-      <xref linkend="qt5"/> 
-    </para>
-
-    <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional">
-      <xref linkend="pulseaudio"/> 
-    </para>
-
-    <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/phonon"/></para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Phonon</title>
-
-    <para>Make sure <xref linkend="qt4"/> has been built without the bundled
-    <application>Phonon</application> library. This package provides
-    a better implementation.</para>
-
-    <note>
-      <para>
-        If you have both Qt4 and Qt5 installed, be sure to run 
-        <userinput>source setqt4</userinput> before installing Phonon.
-      </para>
-
-    </note>
-  
-    <para>Install <application>Phonon</application> by running the following
-    commands:</para>
-
-<screen><userinput>sed -i "s:BSD_SOURCE:DEFAULT_SOURCE:g" cmake/FindPhononInternal.cmake &amp;&amp;
-
-mkdir build &amp;&amp;
-cd    build &amp;&amp;
-
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;                         \
-      -DCMAKE_BUILD_TYPE=Release                                 \
-      -DCMAKE_INSTALL_LIBDIR=lib                                 \
-      -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE        \
-      -DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces \
-      -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="commands">
-    <title>Command Explanations</title>
-
-    <para>
-      <command>sed ... cmake/FindPhononInternal.cmake</command>: Silence
-      a lot of warnings caused by the latest toolchain.
-    </para>
-
-    <para>
-      <parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is used
-      to apply higher level of the compiler optimizations.
-    </para>
-
-    <para>
-      <parameter>-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=FALSE</parameter>:
-      This switch ensures that the plugins and mkspecs files get installed in
-      the correct location.
-    </para>
-
-    <para>
-     <parameter>-DDBUS_INTERFACES_INSTALL_DIR=/usr/share/dbus-1/interfaces</parameter>:
-      This switch sets the correct installation path for the 
-      <application>D-Bus</application> interfaces file.
-    </para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title>Contents</title>
-
-    <segmentedlist>
-      <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directories</segtitle>
-
-      <seglistitem>
-        <seg>
-          None
-        </seg>
-        <seg>
-          libphonon.so and
-          libphononexperimental.so
-        </seg>
-        <seg>
-          &kde-dir;/include/KDE/Phonon,
-          &kde-dir;/include/phonon,
-          &kde-dir;/lib/cmake/phonon, and
-          &kde-dir;/share/phonon
-        </seg>
-      </seglistitem>
-    </segmentedlist>
-
-  </sect2>
-
-</sect1>
Index: kde/libdbusmenuqt.xml
===================================================================
--- kde/libdbusmenuqt.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
+++ kde/libdbusmenuqt.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -0,0 +1,182 @@
+<?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 libdbusmenu-qt-download-http "http://anduin.linuxfromscratch.org/sources/other//libdbusmenu-qt-&libdbusmenu-qt-version;.tar.xz">
+  <!ENTITY libdbusmenu-qt-download-ftp  " ">
+  <!ENTITY libdbusmenu-qt-md5sum        "d21a1f5569e0bc9c9245b4f71761c62f">
+  <!ENTITY libdbusmenu-qt-size          "40 KB">
+  <!ENTITY libdbusmenu-qt-buildsize     "2.6 MB">
+  <!ENTITY libdbusmenu-qt-time          "0.2 SBU">
+]>
+
+<sect1 id="libdbusmenu-qt" xreflabel="libdbusmenu-qt-&libdbusmenu-qt-version;">
+  <?dbhtml filename="libdbusmenu-qt.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libdbusmenu-qt-&libdbusmenu-qt-version;</title>
+
+  <indexterm zone="libdbusmenu-qt">
+    <primary sortas="a-libdbusmenu-qt">libdbusmenu-qt</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libdbusmenu-qt</title>
+
+    <para>This library provides a <application>Qt</application> implementation
+    of the DBusMenu specs, which goal is to expose menus on DBus.  Its
+    libraries are used by both KDE4 and KF5, but they must be linked to <xref
+    linkend='qt4'/> and <xref linkend='qt5'/> respectively. The two versions to
+    not conflict with each other. </para>
+
+    &lfs77_checked; &gcc5_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>Download (HTTP): <ulink url="&libdbusmenu-qt-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download (FTP): <ulink url="&libdbusmenu-qt-download-ftp;"/></para>
+      </listitem>
+      <listitem>
+        <para>Download MD5 sum: &libdbusmenu-qt-md5sum;</para>
+      </listitem>
+      <listitem>
+        <para>Download size: &libdbusmenu-qt-size;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated disk space required: &libdbusmenu-qt-buildsize;</para>
+      </listitem>
+      <listitem>
+        <para>Estimated build time: &libdbusmenu-qt-time;</para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libdbusmenu-qt Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Required</bridgehead>
+    <para role="required">
+    <xref linkend="qt4"/> or <xref linkend="qt5"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <xref linkend="qjson"/> (for building the test suite) and
+    <xref linkend="doxygen"/> (for building the API documentation)
+    </para>
+
+    <para condition="html" role="usernotes">User Notes:
+    <ulink url="&blfs-wiki;/libdbusmenu-qt"/></para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libdbusmenu-qt</title>
+
+    <para>Install the qt4 based version of
+    <application>libdbusmenu-qt</application> by running the following
+    commands:</para>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DUSE_QT4=TRUE              \
+      -DWITH_DOC=OFF              \
+      -Wno-dev .. &amp;&amp;
+make</userinput></screen>
+
+    <para>To test the results
+    (<ulink url="http://qjson.sourceforge.net/">QJson</ulink> must be installed),
+    issue: <command>make -k check</command>. One test is known to fail.</para>
+
+    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>Install the qt5 based version of
+    <application>libdbusmenu-qt</application> by running the following
+    commands:</para>
+
+    <note><para>If building both versions of this application, be sure
+    to remove the previous version of the source and reextract them from
+    the original tar file.</para></note>
+
+<screen><userinput>mkdir build &amp;&amp;
+cd    build &amp;&amp;
+
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release  \
+      -DWITH_DOC=OFF              \
+      -Wno-dev .. &amp;&amp;
+make</userinput></screen>
+
+    <para>The qt5 version of this package does not have 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><option>-DCMAKE_BUILD_TYPE=Release</option>: This switch is used to
+    build without debugging symbols and apply a higher level of compiler 
+    optimizations.</para>
+
+    <para><option>-DUSE_QT4=TRUE</option>: This switch is used to ensure that
+    Qt4 version of the library is built even if Qt5 is present.</para>
+
+    <para><option>-DWITH_DOC=OFF</option>: This option is set to avoid building
+    the API documentation. Omit it if you have <application>doxygen</application>
+    installed and want the documentation.</para>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>None</seg>
+        <seg>libdbusmenu-qt.so and libdbusmenu-qt5.so</seg>
+        <seg>/usr/include/dbusmenu-qt and
+             /usr/include/dbusmenu-qt5</seg>
+      </seglistitem>
+    </segmentedlist>
+<!--
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="a-automoc4">
+        <term><command>automoc4</command></term>
+        <listitem>
+          <para>is a testing utility for libdbusmenu-qt-generated build trees.</para>
+          <indexterm zone="a-automoc4 automoc4">
+            <primary sortas="b-automoc4">automoc4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+-->
+  </sect2>
+
+</sect1>
Index: kde/polkit-qt.xml
===================================================================
--- kde/polkit-qt.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ kde/polkit-qt.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -74,5 +74,5 @@
     <xref linkend="cmake"/>,
     <xref linkend="polkit"/>, and
-    <xref linkend="qt4"/>
+    <xref linkend="qt4"/> or <xref linkend="qt5"/>
     </para>
 
@@ -93,5 +93,5 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=/etc \
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
       -DCMAKE_INSTALL_LIBDIR=lib  \
@@ -116,5 +116,5 @@
 cd    build &amp;&amp;
 
-cmake -DCMAKE_INSTALL_PREFIX=/etc \
+cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
       -DCMAKE_INSTALL_LIBDIR=lib  \
Index: multimedia/libdriv/gst-plugins-base.xml
===================================================================
--- multimedia/libdriv/gst-plugins-base.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ multimedia/libdriv/gst-plugins-base.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -103,8 +103,8 @@
     <para role="recommended">
       <xref linkend="alsa-lib"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="libogg"/>,
       <xref linkend="libtheora"/>,
-      <xref linkend="libvorbis"/>,
-      <xref linkend="udev-extras"/> (for gudev), and
+      <xref linkend="libvorbis"/>, and
       <xref linkend="xorg7-lib"/>
     </para>
Index: multimedia/libdriv/gst10-plugins-good.xml
===================================================================
--- multimedia/libdriv/gst10-plugins-good.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ multimedia/libdriv/gst10-plugins-good.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -108,8 +108,8 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="libdv"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="speex"/>,
       <xref linkend="taglib"/>,
-      <xref linkend="udev-extras"/> (for GUdev),
       <xref linkend="valgrind"/>,
       <xref linkend='v4l-utils'/>,
Index: networking/netutils/networkmanager.xml
===================================================================
--- networking/netutils/networkmanager.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ networking/netutils/networkmanager.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -81,8 +81,8 @@
     <para role="required">
       <xref linkend="dbus-glib"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="libndp"/>,
-      <xref linkend="libnl"/>,
-      <xref linkend="nss"/>, and
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="libnl"/>, and
+      <xref linkend="nss"/>
     </para>
 
Index: packages.ent
===================================================================
--- packages.ent	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ packages.ent	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -109,5 +109,4 @@
 <!ENTITY libcroco-version             "0.6.8">
 <!ENTITY libdaemon-version            "0.14">
-<!ENTITY libdbusmenu-qt-version       "0.9.2">
 <!ENTITY libdrm-version               "2.4.61">
 <!ENTITY libepoxy-version             "1.2">
@@ -118,4 +117,5 @@
 <!ENTITY libgpg-error-version         "1.19">
 <!ENTITY libgsf-version               "1.14.33">
+<!ENTITY libgudev-version             "230">
 <!ENTITY libgusb-version              "0.2.5">
 <!ENTITY libical-version              "1.0.1">
@@ -512,4 +512,5 @@
 <!ENTITY kdepim-version               "4.14.9">
 <!ENTITY automoc4-version             "0.9.88">
+<!ENTITY kf5-short-version            "5.11">
 <!ENTITY kf5-version                  "5.11.0">
 <!ENTITY phonon-version               "4.8.3">
@@ -523,4 +524,5 @@
 <!ENTITY polkit-qt-version            "0.112.0">
 <!ENTITY polkit-kde-agent-version     "0.99.0">
+<!ENTITY libdbusmenu-qt-version       "0.9.3+15.10.20150604">
 
 <!-- Part VIII -->
Index: x/lib/clutter.xml
===================================================================
--- x/lib/clutter.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ x/lib/clutter.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -101,5 +101,5 @@
       <xref linkend="gtk-doc"/>,
       <xref linkend="libevdev"/>,
-      <xref linkend="udev-extras"/> (for GUdev),
+      <xref linkend="libgudev"/>,
       <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
       <ulink url="https://github.com/kergoth/tslib">Tslib</ulink>, and
Index: x/lib/qt5.xml
===================================================================
--- x/lib/qt5.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ x/lib/qt5.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -234,5 +234,4 @@
             -dbus-linked               \
             -openssl-linked            \
-            -journald                  \
             -system-harfbuzz           \
             -system-sqlite             \
@@ -241,5 +240,4 @@
             -optimized-qmake           \
             -skip qtwebengine          &amp;&amp;
-
 make</userinput></screen>
 
Index: x/lib/webkitgtk.xml
===================================================================
--- x/lib/webkitgtk.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ x/lib/webkitgtk.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -82,4 +82,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="icu"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="libsecret"/>,
       <xref linkend="libsoup"/>,
@@ -87,6 +88,5 @@
       <xref linkend="mesalib"/>,
       <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="sqlite"/> and
       <xref linkend="which"/>
     </para>
Index: x/lib/webkitgtk2.xml
===================================================================
--- x/lib/webkitgtk2.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ x/lib/webkitgtk2.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -81,4 +81,5 @@
       <xref linkend="gtk3"/>,
       <xref linkend="icu"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="libsecret"/>,
       <xref linkend="libsoup"/>,
@@ -86,6 +87,5 @@
       <xref linkend="mesalib"/>,
       <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/>,
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="sqlite"/> and
       <xref linkend="which"/>
     </para>
Index: xfce/core/thunar-volman.xml
===================================================================
--- xfce/core/thunar-volman.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ xfce/core/thunar-volman.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -78,6 +78,6 @@
     <para role="required">
       <xref linkend="exo"/>,
-      <xref linkend="libxfce4ui"/> and
-      <xref linkend="udev-extras"/> (for GUdev)
+      <xref linkend="libgudev"/>,
+      <xref linkend="libxfce4ui"/>
     </para>
 
Index: xfce/core/thunar.xml
===================================================================
--- xfce/core/thunar.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ xfce/core/thunar.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -89,6 +89,6 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="libnotify"/>,
-      <xref linkend="udev-extras"/> (for GUdev) and
+      <xref linkend="libgudev"/>,
+      <xref linkend="libnotify"/> and
       <xref linkend="xfce4-panel"/>
     </para>
Index: xsoft/other/gimp.xml
===================================================================
--- xsoft/other/gimp.xml	(revision 28d76c06b14c22eb653ac4b6c005453cbb1ee1ca)
+++ xsoft/other/gimp.xml	(revision f175d6f60d6c7a90f2d78870ab389e66210c471a)
@@ -144,4 +144,5 @@
       <xref linkend="lcms"/> or <xref linkend="lcms2"/>,
       <xref linkend="libexif"/>,
+      <xref linkend="libgudev"/>,
       <xref linkend="libmng"/>,
       <xref linkend="librsvg"/>,
@@ -150,5 +151,4 @@
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
-      <xref linkend="udev-extras"/> (for GUdev),
       <xref linkend="webkitgtk2"/> (required for the help-plugin) and
       <xref linkend="gtk-doc"/>
