Index: multimedia/audioutils/amarok.xml
===================================================================
--- multimedia/audioutils/amarok.xml	(revision edddb6536e0b98c6836fd4a64b04944d4014e61b)
+++ multimedia/audioutils/amarok.xml	(revision b7b6efc4b3cf557814a856bc4ec2ee771ac98206)
@@ -7,7 +7,7 @@
   <!ENTITY amarok-download-http "&kde-download-http;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
   <!ENTITY amarok-download-ftp  "&kde-download-ftp;amarok/&amarok-version;/src/amarok-&amarok-version;.tar.bz2">
-  <!ENTITY amarok-md5sum        "116f53c1109c7acd1ac7d78ec75c01c4">
-  <!ENTITY amarok-size          "42 MB">
-  <!ENTITY amarok-buildsize     "869 MB">
+  <!ENTITY amarok-md5sum        "4ccb750a9e86ce17d4172f770ac7a663">
+  <!ENTITY amarok-size          "41 MB">
+  <!ENTITY amarok-buildsize     "305 MB">
   <!ENTITY amarok-time          "9.2 SBU">
 ]>
@@ -30,10 +30,11 @@
     <title>Introduction to Amarok</title>
 
-    <para><application>Amarok</application> is a powerful audio player for 
-    the KDE environment.
-    Features include a context browser, integration with many online music 
-    services and support for management of several digital music players 
-    including Apple's iPod.</para>
-    
+    <para>
+      <application>Amarok</application> is a powerful audio player for 
+      the KDE environment. Features include a context browser, integration
+      with many online music  services and support for management of
+      several digital music players including Apple's iPod.
+    </para>
+
     &lfs72_checked;
 
@@ -41,20 +42,32 @@
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Download (HTTP): <ulink url="&amarok-download-http;"/></para>
+        <para>
+          Download (HTTP): <ulink url="&amarok-download-http;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download (FTP): <ulink url="&amarok-download-ftp;"/></para>
+        <para>
+          Download (FTP): <ulink url="&amarok-download-ftp;"/>
+        </para>
       </listitem>
       <listitem>
-        <para>Download MD5 sum: &amarok-md5sum;</para>
+        <para>
+          Download MD5 sum: &amarok-md5sum;
+        </para>
       </listitem>
       <listitem>
-        <para>Download size: &amarok-size;</para>
+        <para>
+          Download size: &amarok-size;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated disk space required: &amarok-buildsize;</para>
+        <para>
+          Estimated disk space required: &amarok-buildsize;
+        </para>
       </listitem>
       <listitem>
-        <para>Estimated build time: &amarok-time;</para>
+        <para>
+          Estimated build time: &amarok-time;
+        </para>
       </listitem>
     </itemizedlist>
@@ -64,34 +77,34 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-    <xref linkend="kdelibs"/>,
-    <xref linkend="mysql"/> and
-    <xref linkend="taglib"/>
+      <xref linkend="kdelibs"/>,
+      <xref linkend="mysql"/> and
+      <xref linkend="taglib"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="ffmpeg"/>
+      <xref linkend="ffmpeg"/> and
+      <xref linkend="nepomuk-core"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-    <xref linkend="curl"/> (for MP3tunes integration),
-    <xref linkend="libxml2"/> (for MP3tunes integration),
-    <xref linkend="openssl"/> (for MP3tunes integration),
-    <xref linkend="glib2"/> (for MP3tunes integration),
-    <xref linkend="gdk-pixbuf"/> (for iPod support),
-    <ulink url="http://qjson.sourceforge.net/">QJson</ulink> (for Playdar integration),
-    <ulink url="http://www.gtkpod.org/libgpod.html">libgpod</ulink> (for iPod support),
-    <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink> (for MTP device support),
-    <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>,
-    <ulink url="http://launchpad.net/liblastfm">liblastfm</ulink> (for Last.fm integration),
-    <ulink url="http://code.google.com/p/musicip-libofa">libofa</ulink> (for MusicDNS support),
-    <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt">libmygpo-qt</ulink> (for gpodder.net podcast support) and
-    <ulink url="http://launchpad.net/loudmouth">loudmouth</ulink> (for MP3tunes integration)
+      <xref linkend="curl"/> (for MP3tunes integration),
+      <xref linkend="libxml2"/> (for MP3tunes integration),
+      <xref linkend="openssl"/> (for MP3tunes integration),
+      <ulink url="http://code.google.com/p/clamz/">Clamz</ulink> (For Amazon integration),
+      <ulink url="http://www.gtkpod.org/libgpod.html">libgpod</ulink> (for iPod support),
+      <ulink url="https://github.com/lastfm/liblastfm">liblastfm</ulink> (for Last.fm integration),
+      <ulink url="http://libmtp.sourceforge.net/">libmtp</ulink> (for MTP device support),
+      <ulink url="http://wiki.gpodder.org/wiki/Libmygpo-qt">libmygpo-qt</ulink> (for gpodder.net podcast support),
+      <ulink url="http://code.google.com/p/musicip-libofa">libofa</ulink> (for MusicDNS support),
+      <ulink url="&gnome-download-http;/loudmouth">Loudmouth</ulink> (for MP3tunes integration),
+      <ulink url="http://qjson.sourceforge.net/">QJson</ulink> (for Playdar integration) and
+      <ulink url="http://code.google.com/p/qtscriptgenerator/">qtscript-qt</ulink>
     </para>
     
     <para condition="html" role="usernotes">User Notes:
-    <ulink url="&blfs-wiki;/amarok"/></para>
-
+      <ulink url="&blfs-wiki;/amarok"/>
+    </para>
   </sect2>
 
@@ -99,28 +112,24 @@
     <title>Installation of Amarok</title>
 
-    <para>Install <application>Amarok</application> by running
-    the following commands:</para>
+    <para>
+      Install <application>Amarok</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>mkdir build &amp;&amp;
 cd build &amp;&amp;
-cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; .. &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=&kde-dir; \
+      -DCMAKE_BUILD_TYPE=Release         \
+      .. &amp;&amp;
 make</userinput></screen>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</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>- -prefix=$(kde-config - -prefix)</parameter>: This
-    parameter uses <command>kde-config</command> to establish the prefix of
-    the existing KDE installation and then sets the installation prefix for
-    <application>Amarok</application> to the same value.</para>
-
-  </sect2>
--->
   <sect2 role="content">
     <title>Contents</title>
@@ -132,14 +141,20 @@
 
       <seglistitem>
-        <seg>amarok, amarok_afttagger, amarokcollectionscanner
-        and amarokpkg</seg>
-        <seg>libamarok-sqlcollection.so, libamarok-transcoding.so, 
-	libamarokcore.so, libamaroklib.so, libamarokocsclient.so, 
-	libamarokpud.so, libampache_account_login.so and several
-	libraries in &kde-dir;/lib/kde4</seg>
-	<seg>several in &kde-dir;/share</seg>
+        <seg>
+          amarok, amarok_afttagger, amarokcollectionscanner,
+          amarokpkg and amzdownloader
+        </seg>
+        <seg>
+          libamarokcore.so, libamaroklib.so, libamarokocsclient.so, libamarokpud.so,
+          libamarok_service_lastfm_shared.so, libamarok-sqlcollection.so,
+          libamarok-transcoding.so, libampache_account_login.so and several
+          libraries in &kde-dir;/lib/kde4
+        </seg>
+	<seg>
+          several in &kde-dir;/share
+        </seg>
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -150,6 +165,8 @@
         <term><command>amarok</command></term>
         <listitem>
-          <para>is a wrapper for <command>amarokapp</command> to speed up
-          command line argument passing</para>
+          <para>
+            Is a powerful music player and organizer built on top of
+            KDE development platform.
+          </para>
           <indexterm zone="amarok amarok-prog">
             <primary sortas="b-amarok">amarok</primary>
@@ -158,47 +175,6 @@
       </varlistentry>
 
-      <varlistentry id="amarokapp">
-        <term><command>amarokapp</command></term>
-        <listitem>
-          <para>is the <application>Amarok</application> audio player</para>
-          <indexterm zone="amarok amarokapp">
-            <primary sortas="b-amarokapp">amarokapp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
+    </variablelist>
 
-      <varlistentry id="amarokcollectionscanner">
-        <term><command>amarokcollectionscanner</command></term>
-        <listitem>
-          <para>is used to scan a directory structure and build a collection</para>
-          <indexterm zone="amarokcollectionscanner">
-            <primary sortas="b-amarokcollectionscanner">amarokcollectionscanner</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amarok_daapserver.rb">
-        <term><command>amarok_daapserver.rb</command></term>
-        <listitem>
-          <para>is a DAAP server for <application>Amarok</application></para>
-          <indexterm zone="amarok amarok_daapserver.rb">
-            <primary sortas="b-amarok_daapserver.rb">amarok_daapserver.rb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="amarok_proxy.rb">
-        <term><command>amarok_proxy.rb</command></term>
-        <listitem>
-          <para>is a proxy server for DAAP and
-          <ulink url="http://www.last.fm/">Last.fm</ulink></para>
-          <indexterm zone="amarok amarok_proxy.rb">
-            <primary sortas="b-amarok_proxy.rb">amarok_proxy.rb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
--->
   </sect2>
 
