- update to -> 1.4.1

- remove libvisual support, as only libvis-0.4 is supported
- add extra patch for 4.x build

10 files changed, 574 insertions, 82 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 6cff56cfbe5..3309fde0850 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.0a
+PORTVERSION=	1.4.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,11 +14,11 @@ MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Media player for KDE
 
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
-		tunepimp:${PORTSDIR}/audio/libtunepimp \
+		tunepimp.3:${PORTSDIR}/audio/libtunepimp-old \
 		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
 		xine.15:${PORTSDIR}/multimedia/libxine
 
-MIN_OPTIONS_VER=	${PORTNAME}-1.4.0a
+MIN_OPTIONS_VER=	${PORTNAME}-1.4.1
 
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
@@ -26,11 +26,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_RUBY=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 
 OPTIONS=	GPOD "iPod support" on \
 		XMMS "XMMS visualizations" off \
-		LIBVISUAL "libvisual support" off \
 		OPENGL "OpenGL support" on \
 		AMAZON "Amazon cover fetching support" on \
 		MYSQL "Use MySQL as collection backend" off \
@@ -38,9 +36,14 @@ OPTIONS=	GPOD "iPod support" on \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES+=	${PATCHDIR}/extra-amarok_src_expression.h
+.endif
+
 CONFIGURE_ARGS+=--without-exscalibar \
 		--with-mp4v2 \
-		--with-mp4v2-dir=${PREFIX}
+		--with-mp4v2-dir=${PREFIX} \
+		--without-libvisual
 
 .if !defined(WITH_GPOD)
 PLIST_SUB+=	GPOD="@comment "
@@ -59,14 +62,6 @@ LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 PLIST_SUB+=	XMMS=""
 .endif
 
-.if !defined(WITH_LIBVISUAL)
-PLIST_SUB+=	LIBVISUAL="@comment "
-CONFIGURE_ARGS+=--without-libvisual
-.else
-LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
-PLIST_SUB+=	LIBVISUAL=""
-.endif
-
 .if defined(WITHOUT_OPENGL)
 CONFIGURE_ARGS+=--without-opengl
 .endif
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index f9900196e19..f8c12e83f13 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.0a.tar.bz2) = 3ceffe6465290eef618861cdb81b420a
-SHA256 (amarok-1.4.0a.tar.bz2) = 46d298226ff855c68b1d179d900441fd3c2329f42a938c3fc842a218ab762344
-SIZE (amarok-1.4.0a.tar.bz2) = 13045009
+MD5 (amarok-1.4.1.tar.bz2) = 4ed6e766541c4227d1d8c8eb93d0b891
+SHA256 (amarok-1.4.1.tar.bz2) = dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd
+SIZE (amarok-1.4.1.tar.bz2) = 13509939
diff --git a/audio/amarok-kde4/files/extra-amarok_src_expression.h b/audio/amarok-kde4/files/extra-amarok_src_expression.h
new file mode 100644
index 00000000000..47b874c4131
--- /dev/null
+++ b/audio/amarok-kde4/files/extra-amarok_src_expression.h
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- amarok/src/expression.h.orig
++++ amarok/src/expression.h
+@@ -27,8 +27,8 @@
+ {
+     QString field;
+     QString text;
+-    bool negate: 1;
+-    enum { Contains, Less, More } match: 2;
++    bool negate;
++    enum { Contains, Less, More } match;
+     expression_element(): negate( false ), match( Contains ) { }
+ };
+ typedef QValueVector<expression_element> or_list;
diff --git a/audio/amarok-kde4/files/patch-amarok_src_lastfm.cpp b/audio/amarok-kde4/files/patch-amarok_src_lastfm.cpp
new file mode 100644
index 00000000000..14473120eaa
--- /dev/null
+++ b/audio/amarok-kde4/files/patch-amarok_src_lastfm.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- amarok/src/lastfm.cpp.orig
++++ amarok/src/lastfm.cpp
+@@ -729,7 +729,7 @@
+ 
+     QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
+ 
+-    QString token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
++    token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
+                        .arg( QString( QUrl( currentUsername() ).encodedPathAndQuery() ) )
+                        .arg( QString( QUrl( md5pass ).encodedPathAndQuery() ) )
+                        .arg( QString( QUrl( challenge ).encodedPathAndQuery() ) )
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index 0d0a9e54e39..6c69bf4498a 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -1,11 +1,11 @@
 bin/amarok
 bin/amarokapp
 bin/amarokcollectionscanner
+bin/amarok_proxy.rb
 lib/libamarok.so
 lib/libamarok.so.0
 lib/libamarok.a
 lib/libamarok.la
-%%LIBVISUAL%%bin/amarok_libvisual
 %%XMMS%%bin/amarok_xmmswrapper2
 lib/kde3/konqsidebar_universalamarok.a
 lib/kde3/konqsidebar_universalamarok.la
@@ -24,9 +24,8 @@ lib/kde3/libamarok_void-engine_plugin.la
 lib/kde3/libamarok_void-engine_plugin.so
 share/applications/kde/amarok.desktop
 share/apps/amarok/amarokui.rc
-share/apps/amarok/amarokui_xmms.rc
+share/apps/amarok/data/Amarok_1.4_Welcome.ogg
 share/apps/amarok/data/Cool-Streams.xml
-share/apps/amarok/data/amaroK_1.4_welcome.ogg
 share/apps/amarok/data/ball.png
 share/apps/amarok/data/dot.png
 share/apps/amarok/data/equalizer_presets.xml
@@ -39,26 +38,54 @@ share/apps/amarok/icons/crystalsvg/16x16/actions/dynamic.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/equalizer.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/mini_dock.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/podcast.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/podcast_new.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/random.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/visualizations.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/wiki.png
+share/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast.png
+share/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast_new.png
+share/apps/amarok/icons/crystalsvg/22x22/actions/babelfish.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/dynamic.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/random.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
+share/apps/amarok/icons/crystalsvg/64x64/actions/podcast.png
+share/apps/amarok/icons/crystalsvg/64x64/actions/podcast_new.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/random.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
-share/apps/amarok/icons/crystalsvg/scalable/actions/dynamic.svg
-share/apps/amarok/icons/crystalsvg/scalable/actions/player_playlist_2.svg
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_play.png
@@ -67,20 +94,64 @@ share/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/16x16/actions/collection.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_play.png
@@ -89,20 +160,64 @@ share/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/22x22/actions/collection.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_play.png
@@ -111,21 +226,65 @@ share/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_undo.png
-share/apps/amarok/icons/hicolor/32x32/actions/collection.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/32x32/actions/audioscrobbler.png
+share/apps/amarok/icons/hicolor/32x32/actions/collection.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_play.png
@@ -134,20 +293,64 @@ share/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/48x48/actions/collection.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_play.png
@@ -156,13 +359,34 @@ share/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/64x64/actions/collection.png
 share/apps/amarok/images/amarok_cut.png
 share/apps/amarok/images/amarok_rocks.jpg
@@ -171,7 +395,6 @@ share/apps/amarok/images/b_pause.png
 share/apps/amarok/images/b_play.png
 share/apps/amarok/images/b_prev.png
 share/apps/amarok/images/b_stop.png
-share/apps/amarok/images/babelfish.png
 share/apps/amarok/images/back_stars_grey.png
 share/apps/amarok/images/currenttrack_bar_left.png
 share/apps/amarok/images/currenttrack_bar_mid.png
@@ -185,6 +408,7 @@ share/apps/amarok/images/currenttrack_stop_small.png
 share/apps/amarok/images/description.png
 share/apps/amarok/images/eq_active2.png
 share/apps/amarok/images/eq_inactive2.png
+share/apps/amarok/images/lastfm.png
 share/apps/amarok/images/loading1.png
 share/apps/amarok/images/loading2.png
 share/apps/amarok/images/logo_web.png
@@ -209,10 +433,6 @@ share/apps/amarok/images/volumeslider-handle_glow.png
 share/apps/amarok/images/wizard_compact.png
 share/apps/amarok/images/wizard_xmms.png
 share/apps/amarok/images/xine_logo.png
-share/apps/amarok/scripts/amarok_live/README
-share/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
-share/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
-share/apps/amarok/scripts/amarok_live/amarok_live.py
 share/apps/amarok/scripts/common/Publisher.py
 share/apps/amarok/scripts/common/Zeroconf.py
 share/apps/amarok/scripts/lyrics_astraweb/COPYING
@@ -228,6 +448,14 @@ share/apps/amarok/scripts/playlist2html/PlaylistServer.py
 share/apps/amarok/scripts/playlist2html/README
 share/apps/amarok/scripts/playlist2html/playlist2html.py
 share/apps/amarok/scripts/ruby_debug/debug.rb
+share/apps/amarok/scripts/score_default/COPYING
+share/apps/amarok/scripts/score_default/README
+share/apps/amarok/scripts/score_default/score_default.spec
+share/apps/amarok/scripts/score_default/score_default.rb
+share/apps/amarok/scripts/score_impulsive/COPYING
+share/apps/amarok/scripts/score_impulsive/README
+share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
+share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
 share/apps/amarok/scripts/templates/amarok.rb
 share/apps/amarok/scripts/templates/python_qt_template.py
 share/apps/amarok/scripts/templates/ruby_qt_template.rb
@@ -498,15 +726,6 @@ share/doc/HTML/nl/amarok/search.png
 share/doc/HTML/nl/amarok/status_bar.png
 share/doc/HTML/nl/amarok/using.docbook
 share/doc/HTML/nl/amarok/vis_window.png
-share/doc/HTML/pl/amarok/advanced.docbook
-share/doc/HTML/pl/amarok/common
-share/doc/HTML/pl/amarok/config.docbook
-share/doc/HTML/pl/amarok/faq.docbook
-share/doc/HTML/pl/amarok/index.docbook
-share/doc/HTML/pl/amarok/index.cache.bz2
-share/doc/HTML/pl/amarok/quick.docbook
-share/doc/HTML/pl/amarok/requirements.docbook
-share/doc/HTML/pl/amarok/using.docbook
 share/doc/HTML/pt/amarok/advanced.docbook
 share/doc/HTML/pt/amarok/common
 share/doc/HTML/pt/amarok/config.docbook
@@ -641,9 +860,11 @@ share/locale/hu/LC_MESSAGES/amarok.mo
 share/locale/is/LC_MESSAGES/amarok.mo
 share/locale/it/LC_MESSAGES/amarok.mo
 share/locale/ja/LC_MESSAGES/amarok.mo
+share/locale/ka/LC_MESSAGES/amarok.mo
 share/locale/km/LC_MESSAGES/amarok.mo
 share/locale/ko/LC_MESSAGES/amarok.mo
 share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/ms/LC_MESSAGES/amarok.mo
 share/locale/nb/LC_MESSAGES/amarok.mo
 share/locale/nl/LC_MESSAGES/amarok.mo
 share/locale/nn/LC_MESSAGES/amarok.mo
@@ -670,6 +891,8 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
 share/services/amarok_generic-mediadevice.desktop
 share/services/amarok_xine-engine.desktop
 share/services/amarok_void-engine_plugin.desktop
+share/services/lastfm.protocol
+share/servicetypes/amarok_codecinstall.desktop
 share/servicetypes/amarok_plugin.desktop
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
@@ -679,7 +902,6 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/doc/HTML/ru/amarok
 @dirrm share/doc/HTML/pt_BR/amarok
 @dirrm share/doc/HTML/pt/amarok
-@dirrm share/doc/HTML/pl/amarok
 @dirrm share/doc/HTML/nl/amarok
 @dirrm share/doc/HTML/it/amarok
 @dirrm share/doc/HTML/fr/amarok
@@ -694,16 +916,15 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/apps/amarok/themes
 @dirrm share/apps/amarok/scripts/webcontrol
 @dirrm share/apps/amarok/scripts/templates
+@dirrm share/apps/amarok/scripts/score_impulsive
+@dirrm share/apps/amarok/scripts/score_default
 @dirrm share/apps/amarok/scripts/ruby_debug
 @dirrm share/apps/amarok/scripts/playlist2html
 @dirrm share/apps/amarok/scripts/lyrics_lyrc
 @dirrm share/apps/amarok/scripts/lyrics_astraweb
 @dirrm share/apps/amarok/scripts/common
-@dirrm share/apps/amarok/scripts/amarok_live
 @dirrm share/apps/amarok/scripts
 @dirrm share/apps/amarok/images
-@dirrm share/apps/amarok/icons/crystalsvg/scalable/actions
-@dirrm share/apps/amarok/icons/crystalsvg/scalable
 @dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
 @dirrm share/apps/amarok/icons/crystalsvg/64x64
 @dirrm share/apps/amarok/icons/crystalsvg/22x22/actions
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 6cff56cfbe5..3309fde0850 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.0a
+PORTVERSION=	1.4.1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,11 +14,11 @@ MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Media player for KDE
 
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
-		tunepimp:${PORTSDIR}/audio/libtunepimp \
+		tunepimp.3:${PORTSDIR}/audio/libtunepimp-old \
 		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
 		xine.15:${PORTSDIR}/multimedia/libxine
 
-MIN_OPTIONS_VER=	${PORTNAME}-1.4.0a
+MIN_OPTIONS_VER=	${PORTNAME}-1.4.1
 
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
@@ -26,11 +26,9 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl
 USE_RUBY=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
 
 OPTIONS=	GPOD "iPod support" on \
 		XMMS "XMMS visualizations" off \
-		LIBVISUAL "libvisual support" off \
 		OPENGL "OpenGL support" on \
 		AMAZON "Amazon cover fetching support" on \
 		MYSQL "Use MySQL as collection backend" off \
@@ -38,9 +36,14 @@ OPTIONS=	GPOD "iPod support" on \
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 500000
+EXTRA_PATCHES+=	${PATCHDIR}/extra-amarok_src_expression.h
+.endif
+
 CONFIGURE_ARGS+=--without-exscalibar \
 		--with-mp4v2 \
-		--with-mp4v2-dir=${PREFIX}
+		--with-mp4v2-dir=${PREFIX} \
+		--without-libvisual
 
 .if !defined(WITH_GPOD)
 PLIST_SUB+=	GPOD="@comment "
@@ -59,14 +62,6 @@ LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 PLIST_SUB+=	XMMS=""
 .endif
 
-.if !defined(WITH_LIBVISUAL)
-PLIST_SUB+=	LIBVISUAL="@comment "
-CONFIGURE_ARGS+=--without-libvisual
-.else
-LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
-PLIST_SUB+=	LIBVISUAL=""
-.endif
-
 .if defined(WITHOUT_OPENGL)
 CONFIGURE_ARGS+=--without-opengl
 .endif
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index f9900196e19..f8c12e83f13 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.0a.tar.bz2) = 3ceffe6465290eef618861cdb81b420a
-SHA256 (amarok-1.4.0a.tar.bz2) = 46d298226ff855c68b1d179d900441fd3c2329f42a938c3fc842a218ab762344
-SIZE (amarok-1.4.0a.tar.bz2) = 13045009
+MD5 (amarok-1.4.1.tar.bz2) = 4ed6e766541c4227d1d8c8eb93d0b891
+SHA256 (amarok-1.4.1.tar.bz2) = dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd
+SIZE (amarok-1.4.1.tar.bz2) = 13509939
diff --git a/audio/amarok/files/extra-amarok_src_expression.h b/audio/amarok/files/extra-amarok_src_expression.h
new file mode 100644
index 00000000000..47b874c4131
--- /dev/null
+++ b/audio/amarok/files/extra-amarok_src_expression.h
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- amarok/src/expression.h.orig
++++ amarok/src/expression.h
+@@ -27,8 +27,8 @@
+ {
+     QString field;
+     QString text;
+-    bool negate: 1;
+-    enum { Contains, Less, More } match: 2;
++    bool negate;
++    enum { Contains, Less, More } match;
+     expression_element(): negate( false ), match( Contains ) { }
+ };
+ typedef QValueVector<expression_element> or_list;
diff --git a/audio/amarok/files/patch-amarok_src_lastfm.cpp b/audio/amarok/files/patch-amarok_src_lastfm.cpp
new file mode 100644
index 00000000000..14473120eaa
--- /dev/null
+++ b/audio/amarok/files/patch-amarok_src_lastfm.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- amarok/src/lastfm.cpp.orig
++++ amarok/src/lastfm.cpp
+@@ -729,7 +729,7 @@
+ 
+     QCString md5pass = KMD5( KMD5( m_password.utf8() ).hexDigest() + currentTime ).hexDigest();
+ 
+-    QString token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
++    token = QString( "user=%1&auth=%2&nonce=%3recipient=%4" )
+                        .arg( QString( QUrl( currentUsername() ).encodedPathAndQuery() ) )
+                        .arg( QString( QUrl( md5pass ).encodedPathAndQuery() ) )
+                        .arg( QString( QUrl( challenge ).encodedPathAndQuery() ) )
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index 0d0a9e54e39..6c69bf4498a 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -1,11 +1,11 @@
 bin/amarok
 bin/amarokapp
 bin/amarokcollectionscanner
+bin/amarok_proxy.rb
 lib/libamarok.so
 lib/libamarok.so.0
 lib/libamarok.a
 lib/libamarok.la
-%%LIBVISUAL%%bin/amarok_libvisual
 %%XMMS%%bin/amarok_xmmswrapper2
 lib/kde3/konqsidebar_universalamarok.a
 lib/kde3/konqsidebar_universalamarok.la
@@ -24,9 +24,8 @@ lib/kde3/libamarok_void-engine_plugin.la
 lib/kde3/libamarok_void-engine_plugin.so
 share/applications/kde/amarok.desktop
 share/apps/amarok/amarokui.rc
-share/apps/amarok/amarokui_xmms.rc
+share/apps/amarok/data/Amarok_1.4_Welcome.ogg
 share/apps/amarok/data/Cool-Streams.xml
-share/apps/amarok/data/amaroK_1.4_welcome.ogg
 share/apps/amarok/data/ball.png
 share/apps/amarok/data/dot.png
 share/apps/amarok/data/equalizer_presets.xml
@@ -39,26 +38,54 @@ share/apps/amarok/icons/crystalsvg/16x16/actions/dynamic.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/equalizer.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/mini_dock.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/podcast.png
+share/apps/amarok/icons/crystalsvg/16x16/actions/podcast_new.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/random.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/visualizations.png
 share/apps/amarok/icons/crystalsvg/16x16/actions/wiki.png
+share/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast.png
+share/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast_new.png
+share/apps/amarok/icons/crystalsvg/22x22/actions/babelfish.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/dynamic.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/random.png
 share/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
+share/apps/amarok/icons/crystalsvg/64x64/actions/podcast.png
+share/apps/amarok/icons/crystalsvg/64x64/actions/podcast_new.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/random.png
 share/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
-share/apps/amarok/icons/crystalsvg/scalable/actions/dynamic.svg
-share/apps/amarok/icons/crystalsvg/scalable/actions/player_playlist_2.svg
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_play.png
@@ -67,20 +94,64 @@ share/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/16x16/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/16x16/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/16x16/actions/collection.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_play.png
@@ -89,20 +160,64 @@ share/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/22x22/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/22x22/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/22x22/actions/collection.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_play.png
@@ -111,21 +226,65 @@ share/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/32x32/actions/amarok_undo.png
-share/apps/amarok/icons/hicolor/32x32/actions/collection.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/32x32/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/32x32/actions/audioscrobbler.png
+share/apps/amarok/icons/hicolor/32x32/actions/collection.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_play.png
@@ -134,20 +293,64 @@ share/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/48x48/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/48x48/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/48x48/actions/collection.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_add_lyrics.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_add_playlist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_album.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_artist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_audioscrobbler.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_back.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_burn.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_change_language.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_circle.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_clock.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_collection.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_configure.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_covermanager.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_device.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_download.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_dynamic.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_edit.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_editcopy.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_equalizer.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_external.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_fastforward.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_favourite_genres.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_files.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_files2.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_info.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_love.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_lyrics.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_mostplayed.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_music.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_next.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_pause.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_play.png
@@ -156,13 +359,34 @@ share/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_clear.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast2.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_queue.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_random.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_random_album.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_random_no.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_random_track.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_redo.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_refresh.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_remove.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_remove_from_playlist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_album.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_no.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_playlist.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_track.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_rescan.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_rewind.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_save.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_scripts.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_search.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_engine.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_general.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_indicator.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_playback.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_view.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_stop.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_track.png
 share/apps/amarok/icons/hicolor/64x64/actions/amarok_undo.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_visualizations.png
+share/apps/amarok/icons/hicolor/64x64/actions/amarok_zoom.png
 share/apps/amarok/icons/hicolor/64x64/actions/collection.png
 share/apps/amarok/images/amarok_cut.png
 share/apps/amarok/images/amarok_rocks.jpg
@@ -171,7 +395,6 @@ share/apps/amarok/images/b_pause.png
 share/apps/amarok/images/b_play.png
 share/apps/amarok/images/b_prev.png
 share/apps/amarok/images/b_stop.png
-share/apps/amarok/images/babelfish.png
 share/apps/amarok/images/back_stars_grey.png
 share/apps/amarok/images/currenttrack_bar_left.png
 share/apps/amarok/images/currenttrack_bar_mid.png
@@ -185,6 +408,7 @@ share/apps/amarok/images/currenttrack_stop_small.png
 share/apps/amarok/images/description.png
 share/apps/amarok/images/eq_active2.png
 share/apps/amarok/images/eq_inactive2.png
+share/apps/amarok/images/lastfm.png
 share/apps/amarok/images/loading1.png
 share/apps/amarok/images/loading2.png
 share/apps/amarok/images/logo_web.png
@@ -209,10 +433,6 @@ share/apps/amarok/images/volumeslider-handle_glow.png
 share/apps/amarok/images/wizard_compact.png
 share/apps/amarok/images/wizard_xmms.png
 share/apps/amarok/images/xine_logo.png
-share/apps/amarok/scripts/amarok_live/README
-share/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
-share/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
-share/apps/amarok/scripts/amarok_live/amarok_live.py
 share/apps/amarok/scripts/common/Publisher.py
 share/apps/amarok/scripts/common/Zeroconf.py
 share/apps/amarok/scripts/lyrics_astraweb/COPYING
@@ -228,6 +448,14 @@ share/apps/amarok/scripts/playlist2html/PlaylistServer.py
 share/apps/amarok/scripts/playlist2html/README
 share/apps/amarok/scripts/playlist2html/playlist2html.py
 share/apps/amarok/scripts/ruby_debug/debug.rb
+share/apps/amarok/scripts/score_default/COPYING
+share/apps/amarok/scripts/score_default/README
+share/apps/amarok/scripts/score_default/score_default.spec
+share/apps/amarok/scripts/score_default/score_default.rb
+share/apps/amarok/scripts/score_impulsive/COPYING
+share/apps/amarok/scripts/score_impulsive/README
+share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
+share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
 share/apps/amarok/scripts/templates/amarok.rb
 share/apps/amarok/scripts/templates/python_qt_template.py
 share/apps/amarok/scripts/templates/ruby_qt_template.rb
@@ -498,15 +726,6 @@ share/doc/HTML/nl/amarok/search.png
 share/doc/HTML/nl/amarok/status_bar.png
 share/doc/HTML/nl/amarok/using.docbook
 share/doc/HTML/nl/amarok/vis_window.png
-share/doc/HTML/pl/amarok/advanced.docbook
-share/doc/HTML/pl/amarok/common
-share/doc/HTML/pl/amarok/config.docbook
-share/doc/HTML/pl/amarok/faq.docbook
-share/doc/HTML/pl/amarok/index.docbook
-share/doc/HTML/pl/amarok/index.cache.bz2
-share/doc/HTML/pl/amarok/quick.docbook
-share/doc/HTML/pl/amarok/requirements.docbook
-share/doc/HTML/pl/amarok/using.docbook
 share/doc/HTML/pt/amarok/advanced.docbook
 share/doc/HTML/pt/amarok/common
 share/doc/HTML/pt/amarok/config.docbook
@@ -641,9 +860,11 @@ share/locale/hu/LC_MESSAGES/amarok.mo
 share/locale/is/LC_MESSAGES/amarok.mo
 share/locale/it/LC_MESSAGES/amarok.mo
 share/locale/ja/LC_MESSAGES/amarok.mo
+share/locale/ka/LC_MESSAGES/amarok.mo
 share/locale/km/LC_MESSAGES/amarok.mo
 share/locale/ko/LC_MESSAGES/amarok.mo
 share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/ms/LC_MESSAGES/amarok.mo
 share/locale/nb/LC_MESSAGES/amarok.mo
 share/locale/nl/LC_MESSAGES/amarok.mo
 share/locale/nn/LC_MESSAGES/amarok.mo
@@ -670,6 +891,8 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
 share/services/amarok_generic-mediadevice.desktop
 share/services/amarok_xine-engine.desktop
 share/services/amarok_void-engine_plugin.desktop
+share/services/lastfm.protocol
+share/servicetypes/amarok_codecinstall.desktop
 share/servicetypes/amarok_plugin.desktop
 @dirrmtry share/locale/km/LC_MESSAGES
 @dirrmtry share/locale/km
@@ -679,7 +902,6 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/doc/HTML/ru/amarok
 @dirrm share/doc/HTML/pt_BR/amarok
 @dirrm share/doc/HTML/pt/amarok
-@dirrm share/doc/HTML/pl/amarok
 @dirrm share/doc/HTML/nl/amarok
 @dirrm share/doc/HTML/it/amarok
 @dirrm share/doc/HTML/fr/amarok
@@ -694,16 +916,15 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/apps/amarok/themes
 @dirrm share/apps/amarok/scripts/webcontrol
 @dirrm share/apps/amarok/scripts/templates
+@dirrm share/apps/amarok/scripts/score_impulsive
+@dirrm share/apps/amarok/scripts/score_default
 @dirrm share/apps/amarok/scripts/ruby_debug
 @dirrm share/apps/amarok/scripts/playlist2html
 @dirrm share/apps/amarok/scripts/lyrics_lyrc
 @dirrm share/apps/amarok/scripts/lyrics_astraweb
 @dirrm share/apps/amarok/scripts/common
-@dirrm share/apps/amarok/scripts/amarok_live
 @dirrm share/apps/amarok/scripts
 @dirrm share/apps/amarok/images
-@dirrm share/apps/amarok/icons/crystalsvg/scalable/actions
-@dirrm share/apps/amarok/icons/crystalsvg/scalable
 @dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
 @dirrm share/apps/amarok/icons/crystalsvg/64x64
 @dirrm share/apps/amarok/icons/crystalsvg/22x22/actions