Index: multimedia/cdwriteutils/k3b.xml
===================================================================
--- multimedia/cdwriteutils/k3b.xml	(revision 2a7334e817f83927072682e7086242688d50df24)
+++ multimedia/cdwriteutils/k3b.xml	(revision 62aa478021926f3f5c9cdab02f6807a67101abe6)
@@ -8,6 +8,6 @@
   <!ENTITY k3b-download-ftp  " ">
   <!ENTITY k3b-md5sum        "c86113af31a2032e57fd2f302b5f637a">
-  <!ENTITY k3b-size          "12.2 MB">
-  <!ENTITY k3b-buildsize     "387 MB">
+  <!ENTITY k3b-size          "13 MB">
+  <!ENTITY k3b-buildsize     "350 MB">
   <!ENTITY k3b-time          "3.0 SBU">
 ]>
@@ -30,46 +30,60 @@
     <title>Introduction to K3b</title>
 
-    <para>The <application>K3b</application> package contains a KDE-based
-    graphical interface to the <application>Cdrtools</application> and
-    <application>dvd+rw-tools</application> CD/DVD manipulation tools. It also
-    combines the capabilities of many other multimedia packages into one
-    central interface to provide a simple-to-operate application that can be
-    used to handle many of your CD/DVD recording and formatting requirements.
-    This is useful for creating audio, data, video and mixed-mode CDs as well
-    as copying, ripping and burning CDs and DVDs.</para>
-
-    <para>Though <application>K3b</application> can be used to copy almost any
-    DVD to similar medium, it does not provide a way to copy, or reproduce a
-    double-layer DVD onto single-layer medium. Of course, there is not a
-    program anywhere on any platform that can make an exact duplicate of a
-    double-layer DVD onto a single-layer disk, there are programs on some
-    platforms that can compress the data on a double-layer DVD to fit on a
-    single-layer DVD producing a duplicate, but compressed, image. If you need
-    to copy the contents of a double-layer DVD to single-layer medium, you may
-    want to look at the <ulink
-    url="http://www.mcmurchy.com/rmlcopydvd/">RMLCopyDVD</ulink>
-    package.</para>
-
-    &lfs70_checked;
+    <para>
+      The <application>K3b</application> package contains a KDE-based
+      graphical interface to the <application>Cdrtools</application> and
+      <application>dvd+rw-tools</application> CD/DVD manipulation tools. It also
+      combines the capabilities of many other multimedia packages into one
+      central interface to provide a simple-to-operate application that can be
+      used to handle many of your CD/DVD recording and formatting requirements.
+      It is used for creating audio, data, video and mixed-mode CDs as well
+      as copying, ripping and burning CDs and DVDs.
+    </para>
+
+    <para>
+      Though <application>K3b</application> can be used to copy almost any
+      DVD to similar medium, it does not provide a way to copy, or reproduce a
+      double-layer DVD onto single-layer medium. Of course, there is not a
+      program anywhere on any platform that can make an exact duplicate of a
+      double-layer DVD onto a single-layer disk, there are programs on some
+      platforms that can compress the data on a double-layer DVD to fit on a
+      single-layer DVD producing a duplicate, but compressed, image. If you need
+      to copy the contents of a double-layer DVD to single-layer medium, you may
+      want to look at the
+      <ulink url="http://www.mcmurchy.com/rmlcopydvd/">RMLCopyDVD</ulink> package.
+    </para>
+
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&k3b-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download (FTP): <ulink url="&k3b-download-ftp;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sum: &k3b-md5sum;</para>
-      </listitem>
-      <listitem>
-        <para>Download size: &k3b-size;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated disk space required: &k3b-buildsize;</para>
-      </listitem>
-      <listitem>
-        <para>Estimated build time: &k3b-time;</para>
+        <para>
+          Download (HTTP): <ulink url="&k3b-download-http;"/></para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&k3b-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &k3b-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &k3b-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &k3b-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &k3b-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -80,5 +94,5 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg_fix-1.patch"/>
+          <ulink url="&patch-root;/k3b-&k3b-version;-ffmpeg_fix-2.patch"/>
         </para>
       </listitem>
@@ -89,23 +103,26 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="kmix"/> and
+      <xref linkend="kde-runtime"/>,
+      <xref linkend="libkcddb"/> and
       <xref linkend="libsamplerate"/>
     </para>
 
-    <para>There are programs from three packages that
-    <application>K3b</application> will look for at runtime:
-    <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">Cdrtools</ulink>
-    (required to burn CD-ROM media) <!-- can't it use xorriso? No! -->,
-    <xref linkend="dvd-rw-tools"/> (required to burn or format DVD media), and
-    <xref linkend="cdrdao"/> (required to burn CD-ROM media in DAO (Disk At
-    Once) mode). If you don't need the capability provided by any of the three
-    packages, you don't have to install it. However, a warning message will be
-    generated every time you run the <command>k3b</command> program if any are
-    not installed.</para>
+    <para>
+      There are programs from three packages that
+      <application>K3b</application> will look for at runtime:
+      <ulink url="http://cdrecord.berlios.de/private/cdrecord.html">Cdrtools</ulink>
+      (required to burn CD-ROM media), <xref linkend="dvd-rw-tools"/>
+      (required to burn or format DVD media), and <xref linkend="cdrdao"/>
+      (required to burn CD-ROM media in DAO (Disk At Once) mode). If you
+      don't need the capability provided by any of the three packages, you don't
+      have to install it. However, a warning message will be generated every time
+      you run the <command>k3b</command> program if any are not installed.
+    </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
       <xref linkend="ffmpeg"/>,
-      <xref linkend="libjpeg"/>, and
+      <xref linkend="libdvdread"/>,
+      <xref linkend="libjpeg"/> and
       <xref linkend="taglib"/>
     </para>
@@ -113,24 +130,18 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="cdparanoia"/>,
       <xref linkend="flac"/>,
       <xref linkend="lame"/>,
       <xref linkend="libmad"/>,
-      <xref linkend="libmusicbrainz"/>,
+      <xref linkend="libsndfile"/>,
       <xref linkend="libvorbis"/>,
-      <ulink url="http://sox.sourceforge.net/">SoX</ulink>,
-      <ulink url="http://www.musepack.net/">Musepack (libmpcdec)</ulink>,
-      <ulink url="http://www.dtek.chalmers.se/groups/dvd/downloads.shtml">libDVDRead</ulink>,
-      <ulink url="http://www.mega-nerd.com/libsndfile/">libsndfile</ulink>,
-      <ulink url="http://movix.sourceforge.net/">MoviX</ulink>,
-      <ulink url="http://normalize.nongnu.org/">normalize</ulink>,
-      <ulink url="ftp://ftp.lst.de/pub/people/okir/resmgr/">resmgr</ulink>,
-      <ulink url="http://www.vcdimager.org/">VCDImager</ulink>, and 
-      <xref linkend="doxygen"/>
+      <ulink url="http://ftp.musicbrainz.org/pub/musicbrainz/">
+      libmusicbrainz (version 2)</ulink>,
+      <ulink url="http://www.musepack.net/">Musepack (libmpcdec)</ulink> and
+      <ulink url="http://www.vcdimager.org/">VCDImager</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/k3b"/></para>
-
+      <ulink url="&blfs-wiki;/k3b"/>
+    </para>
   </sect2>
 
@@ -138,58 +149,24 @@
     <title>Installation of K3b</title>
 
-    <para>Install <application>K3b</application> by running the following
-    commands:</para>
-
-<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-1.patch &amp;&amp;
+    <para>
+      Install <application>K3b</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../k3b-&k3b-version;-ffmpeg_fix-2.patch &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=&kde-dir;   \
-      -DSYSCONF_INSTALL_DIR=/etc/kde        \
-      -DK3B_ENABLE_HAL_SUPPORT=OFF          \
+      -DSYSCONF_INSTALL_DIR=/etc/kde     \
       ..  &amp;&amp;
 make</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <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="commands">
-    <title>Command Explanations</title>
-
-    <para><parameter>-DK3B_ENABLE_HAL_SUPPORT</parameter>: Do not use the 
-    depricated HAL protocol.</para>
-
-  </sect2>
-
-  <sect2 role="configuration">
-    <title>Configuring k3b</title>
-
-    <sect3 id="k3b-config">
-      <title>Configuration Information</title>
-
-      <para>You will need to ensure that any user of
-      <application>K3b</application> has permission to read and write to the
-      CD/DVD/audio hardware device files. The easiest way to do this is by
-      creating groups (audio, video, cdrecord, dvdrecord, etc.,) and then add
-      users to the appropriate groups. You'll also have to ensure that the
-      <application>Udev</application> rules are set up appropriately if you
-      are using a system where the device files are created during the system
-      boot-up sequence.</para>
-
-      <para>There is a script installed (<command>k3bsetup</command>) that is
-      a front-end to the k3bsetup2 KControlModule. This script can be accessed
-      as a pull-down menu from the K3b GUI and requires
-      <systemitem class="username">root</systemitem> user privileges
-      (<systemitem class="username">root</systemitem> privileges are acquired
-      through the use of the automatically-launched <command>kdesud</command>
-      program). Though this utility can be used to set the appropriate
-      permissions for the device files, be forewarned that in a Udev
-      environment, where the device files are created during the system boot-up
-      sequence, any changes made by this utility will not be preserved across
-      system boots.</para>
-
-    </sect3>
 
   </sect2>
@@ -204,9 +181,15 @@
 
       <seglistitem>
-        <seg>k3b and k3bsetup</seg>
-        <seg>libk3b.so, libk3bdevice.so and numerous
-        modules for the installed dependencies</seg>
-        <seg>The following subdirectories of <envar>&kde-dir;</envar>/share/:
-        applnk/Settings/System, apps/k3b, doc/HTML/en/k3b</seg>
+        <seg>
+          k3b and k3bsetup
+        </seg>
+        <seg>
+          libk3b.so, libk3bdevice.so and numerous
+          modules for the installed dependencies
+        </seg>
+        <seg>
+          The following subdirectories of <envar>&kde-dir;</envar>/share/:
+          applnk/Settings/System, apps/k3b, doc/HTML/en/k3b
+        </seg>
       </seglistitem>
     </segmentedlist>
@@ -220,5 +203,7 @@
         <term><command>k3b</command></term>
         <listitem>
-          <para>is the graphical CD/DVD program.</para>
+          <para>
+            is the graphical CD/DVD program.
+          </para>
           <indexterm zone="k3b k3b-prog">
             <primary sortas="b-k3b">k3b</primary>
@@ -230,7 +215,9 @@
         <term><command>k3bsetup</command></term>
         <listitem>
-          <para>is a script used to launch the k3bsetup2 KControlModule
-          for setting up the CD/DVD hardware and device files in your
-          system.</para>
+          <para>
+            is a script used to launch the k3bsetup2 KControlModule
+            for setting up the CD/DVD hardware and device files on
+            your system.
+          </para>
           <indexterm zone="k3b k3bsetup">
             <primary sortas="b-k3bsetup">k3bsetup</primary>
