Update to 2.8.0

VERSION 2.8
  FEATURES:
   * Tracks from Recently Played List widget can now directly be added to
     the playlist.

  CHANGES:
   * The Jamendo service now uses a higher quality MP3 format instead of
     Ogg Vorbis.
   * Added an option whether adding tracks to playlist should start playing.
   * Amarok now depends on Qt 4.8.3.
   * Amarok now uses FindFFMpeg.cmake from kdelibs

  BUGFIXES:
   Various

VERSION 2.7
  CHANGES:
    * Files page has been made more intuitive by making Places the root
      view and significantly improving breadcrumbs behaviour.
    * Make dropping large directories into playlist more responsive by
      reading track metadata asynchronously in a background thread.
    * Harmonize keyboard, mouse and context menu behaviour of the Files
      pane so that it matches Local Music and Saved Playlists panes.
    * Last.fm Skip button re-added after being removed in Beta by error.
    * Podcast episodes are now loaded asynchronously on startup to reduce
      delays.
    * Removed alpha state and not really working spectrum analyzer applet.

  BUGFIXES:
   Various

7 files changed, 125 insertions, 279 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index edf0f9d6970..162f574a3bd 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.137 2013/10/17 07:56:40 wiz Exp $
+# $NetBSD: Makefile,v 1.138 2013/11/18 10:53:44 markd Exp $
 #
 
 DISTNAME=	amarok-${VERS}
-VERS=		2.6.0
-PKGREVISION=	16
+VERS=		2.8.0
 CATEGORIES=	audio multimedia
 MASTER_SITES=	ftp://ftp.kde.org/pub/kde/stable/amarok/${VERS}/src/
 EXTRACT_SUFX=	.tar.bz2
@@ -61,6 +60,7 @@ BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.6nb1
 .include "../../devel/qtscriptgenerator/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../misc/nepomuk-core/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libkcompactdisc/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index 4a736e12343..a1f0ad8d27e 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,55 +1,45 @@
-@comment $NetBSD: PLIST,v 1.42 2013/05/21 13:06:35 markd Exp $
+@comment $NetBSD: PLIST,v 1.43 2013/11/18 10:53:44 markd Exp $
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
 bin/amarokmp3tunesharmonydaemon
 bin/amarokpkg
-lib/kde4/amarok_appletscript_simple_javascript.so
+bin/amzdownloader
 lib/kde4/amarok_collection-audiocdcollection.so
 lib/kde4/amarok_collection-daapcollection.so
 lib/kde4/amarok_collection-ipodcollection.so
 lib/kde4/amarok_collection-mtpcollection.so
 lib/kde4/amarok_collection-mysqlecollection.so
 lib/kde4/amarok_collection-mysqlservercollection.so
+lib/kde4/amarok_collection-nepomukcollection.so
 lib/kde4/amarok_collection-playdarcollection.so
 lib/kde4/amarok_collection-umscollection.so
 lib/kde4/amarok_collection-upnpcollection.so
 lib/kde4/amarok_containment_vertical.so
 lib/kde4/amarok_context_applet_albums.so
+lib/kde4/amarok_context_applet_analyzer.so
 lib/kde4/amarok_context_applet_currenttrack.so
 lib/kde4/amarok_context_applet_info.so
 lib/kde4/amarok_context_applet_labels.so
 lib/kde4/amarok_context_applet_lyrics.so
 lib/kde4/amarok_context_applet_photos.so
-lib/kde4/amarok_context_applet_similarArtists.so
-lib/kde4/amarok_context_applet_spectrum_analyzer.so
 lib/kde4/amarok_context_applet_tabs.so
-lib/kde4/amarok_context_applet_upcomingEvents.so
 lib/kde4/amarok_context_applet_wikipedia.so
 lib/kde4/amarok_data_engine_current.so
 lib/kde4/amarok_data_engine_info.so
 lib/kde4/amarok_data_engine_labels.so
 lib/kde4/amarok_data_engine_lyrics.so
 lib/kde4/amarok_data_engine_photos.so
-lib/kde4/amarok_data_engine_similarArtists.so
-lib/kde4/amarok_data_engine_spectrum_analyzer.so
 lib/kde4/amarok_data_engine_tabs.so
-lib/kde4/amarok_data_engine_upcomingEvents.so
 lib/kde4/amarok_data_engine_wikipedia.so
-lib/kde4/amarok_device_massstorage.so
-lib/kde4/amarok_device_nfs.so
-lib/kde4/amarok_device_smb.so
-lib/kde4/amarok_runnerscript_javascript.so
 lib/kde4/amarok_service_amazonstore.so
 lib/kde4/amarok_service_ampache.so
 lib/kde4/amarok_service_jamendo.so
-lib/kde4/amarok_service_lastfm.so
 lib/kde4/amarok_service_magnatunestore.so
 lib/kde4/amarok_service_mp3tunes.so
 lib/kde4/amarok_service_opmldirectory.so
 lib/kde4/kcm_amarok_service_amazonstore.so
 lib/kde4/kcm_amarok_service_ampache.so
-lib/kde4/kcm_amarok_service_lastfm.so
 lib/kde4/kcm_amarok_service_magnatunestore.so
 lib/kde4/kcm_amarok_service_mp3tunes.so
 lib/libamarok-sqlcollection.so
@@ -66,13 +56,17 @@ lib/libamaroklib.so.1
 lib/libamaroklib.so.1.0.0
 lib/libamarokocsclient.so
 lib/libamarokocsclient.so.4
-lib/libamarokocsclient.so.4.10.3
+lib/libamarokocsclient.so.4.11.3
 lib/libamarokpud.so
 lib/libamarokpud.so.1
 lib/libamarokpud.so.1.0.0
+lib/libamarokshared.so
+lib/libamarokshared.so.1
+lib/libamarokshared.so.1.0.0
 lib/libampache_account_login.so
 share/applications/kde4/amarok.desktop
 share/applications/kde4/amarok_containers.desktop
+share/applications/kde4/amzdownloader.desktop
 share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
 share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
 share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
@@ -117,11 +111,8 @@ share/doc/kde/HTML/en/amarok/Icon-preferences-other.png
 share/doc/kde/HTML/en/amarok/Icon-view-list-tree.png
 share/doc/kde/HTML/en/amarok/Icon-view-refresh.png
 share/doc/kde/HTML/en/amarok/action-collection-amarok48.png
-share/doc/kde/HTML/en/amarok/advancedtok.png
-share/doc/kde/HTML/en/amarok/album.png
-share/doc/kde/HTML/en/amarok/albumbar.png
+share/doc/kde/HTML/en/amarok/amarok-2-6-duplicates-during-collection-scan.png
 share/doc/kde/HTML/en/amarok/amarok-apg-presets-toolbar.png
-share/doc/kde/HTML/en/amarok/amarok-context.png
 share/doc/kde/HTML/en/amarok/amarok-e17.png
 share/doc/kde/HTML/en/amarok/amarok-fluxbox.png
 share/doc/kde/HTML/en/amarok/amarok-gnome.png
@@ -131,44 +122,71 @@ share/doc/kde/HTML/en/amarok/amarok-maintoolbar.png
 share/doc/kde/HTML/en/amarok/amarok-managing-media.png
 share/doc/kde/HTML/en/amarok/amarok-newdynamic-detail.png
 share/doc/kde/HTML/en/amarok/amarok-newdynamic.png
-share/doc/kde/HTML/en/amarok/amarok-renameplaylist.png
 share/doc/kde/HTML/en/amarok/amarok-slimtoolbar.png
+share/doc/kde/HTML/en/amarok/amarok-statsyncing.png
 share/doc/kde/HTML/en/amarok/amarok-xfce.png
 share/doc/kde/HTML/en/amarok/amarok2-4-1albumtageditdialog.png
 share/doc/kde/HTML/en/amarok/amarok2-4-1albumtageditpertrackdialog.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1configplayback.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1configscripts.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1configspeakersetup.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialog.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialogcollection.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1configuredialogplugins.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1databaseconfig.png
 share/doc/kde/HTML/en/amarok/amarok2-4-1editfilterdialog.png
 share/doc/kde/HTML/en/amarok/amarok2-4-1filenamelayoutchooseroptions.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1mergedviewcollection.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1non-mergedviewcollection.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1notifications.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1phononbackends.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1phonondevices.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1saveplaylistchoices.png
 share/doc/kde/HTML/en/amarok/amarok2-4-1tageditdialog.png
-share/doc/kde/HTML/en/amarok/amarok2-4-1viewmenu.png
-share/doc/kde/HTML/en/amarok/amarok2-4.png
-share/doc/kde/HTML/en/amarok/amarok2-4collectionsortingmenu.png
-share/doc/kde/HTML/en/amarok/amarok2-4helpmenu.png
 share/doc/kde/HTML/en/amarok/amarok2-4musicbrainztagger.png
 share/doc/kde/HTML/en/amarok/amarok2-4organizefilesadvanceddialog.png
-share/doc/kde/HTML/en/amarok/amarok2-4organizefilesbasicdialog.png
 share/doc/kde/HTML/en/amarok/amarok2-4queueeditor.png
 share/doc/kde/HTML/en/amarok/amarok2-4searchplaylist.png
-share/doc/kde/HTML/en/amarok/amarok2-4transcodetracksdialog.png
+share/doc/kde/HTML/en/amarok/amarok2-6configgeneralmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-6flactranscodemenu.png
+share/doc/kde/HTML/en/amarok/amarok2-6helpmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-6playlistalbumcontextmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-6trackcontextmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-6viewconfigmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-6viewundocksymbols.png
+share/doc/kde/HTML/en/amarok/amarok2-7menutools.png
+share/doc/kde/HTML/en/amarok/amarok2-7networkrequestsviewer.png
+share/doc/kde/HTML/en/amarok/amarok2-7renamesavedplaylist.png
+share/doc/kde/HTML/en/amarok/amarok2-7scriptsconfigmenu.png
+share/doc/kde/HTML/en/amarok/amarok2-7thetoolbar.png
 share/doc/kde/HTML/en/amarok/amarok24_configureshortcutdetail.png
 share/doc/kde/HTML/en/amarok/amarok24_configureshortcutsdialog.png
 share/doc/kde/HTML/en/amarok/amarok24_settingsmenu.png
 share/doc/kde/HTML/en/amarok/amarok24_settingsmenu_withreplaygain.png
 share/doc/kde/HTML/en/amarok/amarok2_moodbar.png
+share/doc/kde/HTML/en/amarok/amarok2dot8pud.png
+share/doc/kde/HTML/en/amarok/amarok_2-6_layout.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_appletexplorer_default.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_collectionbrowser_merged.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_collectionbrowser_nonmerged.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_collectionbrowsersearchfield.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_collectionsortingmenu.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialogdatabase.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialogdatabaseenabled.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialoggeneral.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialoglocalcollection.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialognotifications.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialogplayback.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialogplugins.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_configurationdialogscripts.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_contextview_default.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_default.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_mediasourcespanedefault.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_nepomukindexfolders_dialog_kde_4-11.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_organizefilestranscode.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_organizetracks.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_playlistbottombar.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_playlistfilteroptions.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_playlistlayouteditor.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_playlistpane.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_playlistsortinglevels.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_popupdropperadd.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_popupdropperremove.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_remotecollections_samba_server.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_remotecollections_samba_server1.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_savecurrentplaylistoptions.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_startwindowdefault.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_systray_window.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_upnp_collection.png
+share/doc/kde/HTML/en/amarok/amarok_2-8_upnp_collection_plugin.png
 share/doc/kde/HTML/en/amarok/amarok_add-on_installer.png
-share/doc/kde/HTML/en/amarok/amarok_addtoplaylist.png
 share/doc/kde/HTML/en/amarok/amarok_addtoplaylist1.png
 share/doc/kde/HTML/en/amarok/amarok_amarokmenu2-4.png
 share/doc/kde/HTML/en/amarok/amarok_ampache_client2.png
@@ -194,39 +212,30 @@ share/doc/kde/HTML/en/amarok/amarok_playlist_layout_editor.png
 share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog1_s.png
 share/doc/kde/HTML/en/amarok/amarok_playlist_layout_nog2_s.png
 share/doc/kde/HTML/en/amarok/amarok_playlist_layout_v1_s.png
-share/doc/kde/HTML/en/amarok/amarok_playlist_manipulation.png
 share/doc/kde/HTML/en/amarok/amarok_playlist_search_ex.png
-share/doc/kde/HTML/en/amarok/amarok_removeformplaylist.png
 share/doc/kde/HTML/en/amarok/amarok_saved_playlists.png
-share/doc/kde/HTML/en/amarok/amarok_script_info.png
-share/doc/kde/HTML/en/amarok/amarok_script_manager.png
 share/doc/kde/HTML/en/amarok/amarok_show_only_matches.png
 share/doc/kde/HTML/en/amarok/amarok_slim_toolbar.png
+share/doc/kde/HTML/en/amarok/amarok_systray_2-8_4-11.png
 share/doc/kde/HTML/en/amarok/amarok_tracks_media_devices1.png
-share/doc/kde/HTML/en/amarok/amarok_windowlayout.png
 share/doc/kde/HTML/en/amarok/amarokbreadcrumb.png
+share/doc/kde/HTML/en/amarok/amarokconfigurationdialog2-7phononbackend.png
+share/doc/kde/HTML/en/amarok/amarokconfigurationdialog2-7phonondevice.png
+share/doc/kde/HTML/en/amarok/amarokconfigurationdialog2-7phononhardware.png
+share/doc/kde/HTML/en/amarok/amarokconfigurationdialog2-7scriptconsole.png
 share/doc/kde/HTML/en/amarok/amarokmediasources-files.png
 share/doc/kde/HTML/en/amarok/amarokmediasources-home.png
+share/doc/kde/HTML/en/amarok/amaroknepomukcollectionbrowser2-7.png
 share/doc/kde/HTML/en/amarok/amaroknew2-4.png
-share/doc/kde/HTML/en/amarok/amarokrightmenu.png
 share/doc/kde/HTML/en/amarok/amarokripcd.png
-share/doc/kde/HTML/en/amarok/amaroksystray.png
 share/doc/kde/HTML/en/amarok/amaroktoplevelmenus2-4.png
-share/doc/kde/HTML/en/amarok/amarokwindow_context.png
-share/doc/kde/HTML/en/amarok/amarokwindow_mediasources.png
-share/doc/kde/HTML/en/amarok/amarokwindow_playlist.png
 share/doc/kde/HTML/en/amarok/apgpresetsmatchallgroup.png
-share/doc/kde/HTML/en/amarok/app.png
 share/doc/kde/HTML/en/amarok/applications-internet.png
 share/doc/kde/HTML/en/amarok/bookmarking_menu.png
 share/doc/kde/HTML/en/amarok/cd_collection_sansa.png
 share/doc/kde/HTML/en/amarok/common
-share/doc/kde/HTML/en/amarok/context_menu.png
-share/doc/kde/HTML/en/amarok/contextpane.png
-share/doc/kde/HTML/en/amarok/contextpanestopped.png
 share/doc/kde/HTML/en/amarok/controlamarok.png
 share/doc/kde/HTML/en/amarok/document-save.png
-share/doc/kde/HTML/en/amarok/dynamic_playlist.png
 share/doc/kde/HTML/en/amarok/edit-redo.png
 share/doc/kde/HTML/en/amarok/edit-undo.png
 share/doc/kde/HTML/en/amarok/favor.png
@@ -234,37 +243,45 @@ share/doc/kde/HTML/en/amarok/firstruncollection2.png
 share/doc/kde/HTML/en/amarok/folder-amarok.png
 share/doc/kde/HTML/en/amarok/generatedlist.png
 share/doc/kde/HTML/en/amarok/generatingtree.png
+share/doc/kde/HTML/en/amarok/hi48-action-amarok_lyrics.png
 share/doc/kde/HTML/en/amarok/hi48-action-clear-playlist-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-current-track-amarok.png
 share/doc/kde/HTML/en/amarok/hi48-action-edit-playlist-queue.png
+share/doc/kde/HTML/en/amarok/hi48-action-filename-album-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-filename-genre-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-info-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-label-amarok.png
 share/doc/kde/HTML/en/amarok/hi48-action-media-standard-track-progression-amarok.png
 share/doc/kde/HTML/en/amarok/hi48-action-music-amarok.png
 share/doc/kde/HTML/en/amarok/hi48-action-podcast-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-similarartists-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-upcomingevents-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-action-view-media-analyzer-amarok.png
+share/doc/kde/HTML/en/amarok/hi48-image-x-generic.png
 share/doc/kde/HTML/en/amarok/index.cache.bz2
 share/doc/kde/HTML/en/amarok/index.docbook
 share/doc/kde/HTML/en/amarok/installation1-1.png
 share/doc/kde/HTML/en/amarok/installation2.png
 share/doc/kde/HTML/en/amarok/installation3.png
 share/doc/kde/HTML/en/amarok/installation4.png
+share/doc/kde/HTML/en/amarok/ipod-connected-dialog.png
+share/doc/kde/HTML/en/amarok/last-fm-spelling-correction.png
+share/doc/kde/HTML/en/amarok/matchedtrackspage.png
 share/doc/kde/HTML/en/amarok/media_sources1.png
-share/doc/kde/HTML/en/amarok/media_sources3.png
 share/doc/kde/HTML/en/amarok/mediasources.png
 share/doc/kde/HTML/en/amarok/mediasources10.png
-share/doc/kde/HTML/en/amarok/mediasources4.png
 share/doc/kde/HTML/en/amarok/mediasources5.png
 share/doc/kde/HTML/en/amarok/mediasources6.png
 share/doc/kde/HTML/en/amarok/mediasources7.png
 share/doc/kde/HTML/en/amarok/mediasources8.png
 share/doc/kde/HTML/en/amarok/mediasourcesex.png
-share/doc/kde/HTML/en/amarok/new_amarok_configuration_options_general_edit.png
-share/doc/kde/HTML/en/amarok/new_amarok_configuration_options_notifications_edit.png
+share/doc/kde/HTML/en/amarok/metadatadialog.png
 share/doc/kde/HTML/en/amarok/nocover_amarok.png
 share/doc/kde/HTML/en/amarok/oraganize_menu.png
 share/doc/kde/HTML/en/amarok/otherplatforms_nonkde.png
 share/doc/kde/HTML/en/amarok/otherplatforms_osx.png
 share/doc/kde/HTML/en/amarok/otherplatforms_windows.png
-share/doc/kde/HTML/en/amarok/playlist-layout-editor-amarok.png
 share/doc/kde/HTML/en/amarok/playlist-layout-item-configuration-amarok.png
-share/doc/kde/HTML/en/amarok/playlist2.png
 share/doc/kde/HTML/en/amarok/playlist_save.png
 share/doc/kde/HTML/en/amarok/playlistlayout1.png
 share/doc/kde/HTML/en/amarok/playlistlayout2.png
@@ -273,37 +290,24 @@ share/doc/kde/HTML/en/amarok/playlistlayout4.png
 share/doc/kde/HTML/en/amarok/playlistmenu.png
 share/doc/kde/HTML/en/amarok/playlistpic.png
 share/doc/kde/HTML/en/amarok/playlistqueue.png
-share/doc/kde/HTML/en/amarok/playlistsearch.png
 share/doc/kde/HTML/en/amarok/queue.png
 share/doc/kde/HTML/en/amarok/queueend.png
-share/doc/kde/HTML/en/amarok/remotecollections_ampache_client.png
 share/doc/kde/HTML/en/amarok/remotecollections_ampache_client1.png
 share/doc/kde/HTML/en/amarok/remotecollections_ampache_client2.png
-share/doc/kde/HTML/en/amarok/remotecollections_client.png
 share/doc/kde/HTML/en/amarok/remotecollections_daap.png
-share/doc/kde/HTML/en/amarok/remotecollections_daap_config.png
-share/doc/kde/HTML/en/amarok/remotecollections_samba_server.png
-share/doc/kde/HTML/en/amarok/remotecollections_samba_server1.png
-share/doc/kde/HTML/en/amarok/remotecollections_samba_server2.png
-share/doc/kde/HTML/en/amarok/remotecollections_samba_server3.png
-share/doc/kde/HTML/en/amarok/searchincollection.png
 share/doc/kde/HTML/en/amarok/searchincollection_example_editbox.png
 share/doc/kde/HTML/en/amarok/searchincollection_example_editbox2.png
-share/doc/kde/HTML/en/amarok/settings-internet-amarok.png
+share/doc/kde/HTML/en/amarok/slim_toolbar.png
 share/doc/kde/HTML/en/amarok/sorting.png
-share/doc/kde/HTML/en/amarok/sorting2.png
 share/doc/kde/HTML/en/amarok/tagedit_fromfile_advanced.png
 share/doc/kde/HTML/en/amarok/tagedit_fromfile_advanced_example.png
 share/doc/kde/HTML/en/amarok/tagedit_fromfile_basic.png
 share/doc/kde/HTML/en/amarok/tagedit_fromfile_basic_example.png
 share/doc/kde/HTML/en/amarok/toolbar_main.png
-share/doc/kde/HTML/en/amarok/toolbar_slim.png
-share/doc/kde/HTML/en/amarok/toolmenu.png
 share/doc/kde/HTML/en/amarok/tools_bookmarkmanager.png
 share/doc/kde/HTML/en/amarok/tools_covermanager.png
 share/doc/kde/HTML/en/amarok/tools_equalizer.png
 share/doc/kde/HTML/en/amarok/track_progression.png
-share/doc/kde/HTML/en/amarok/transcode_1.png
 share/doc/kde/HTML/en/amarok/view-media-playlist.png
 share/doc/kde/HTML/es/amarok/common
 share/doc/kde/HTML/es/amarok/index.cache.bz2
@@ -498,49 +502,38 @@ share/doc/kde/HTML/sv/amarok/common
 share/doc/kde/HTML/sv/amarok/firstruncollection2.png
 share/doc/kde/HTML/sv/amarok/index.cache.bz2
 share/doc/kde/HTML/sv/amarok/index.docbook
-share/doc/kde/HTML/uk/amarok/advancedtok.png
-share/doc/kde/HTML/uk/amarok/album.png
-share/doc/kde/HTML/uk/amarok/albumbar.png
-share/doc/kde/HTML/uk/amarok/amarok-context.png
+share/doc/kde/HTML/uk/amarok/amarok-2-6-duplicates-during-collection-scan.png
 share/doc/kde/HTML/uk/amarok/amarok-maintoolbar.png
 share/doc/kde/HTML/uk/amarok/amarok-managing-media.png
 share/doc/kde/HTML/uk/amarok/amarok-newdynamic-detail.png
 share/doc/kde/HTML/uk/amarok/amarok-newdynamic.png
-share/doc/kde/HTML/uk/amarok/amarok-renameplaylist.png
 share/doc/kde/HTML/uk/amarok/amarok-slimtoolbar.png
 share/doc/kde/HTML/uk/amarok/amarok2-4-1albumtageditdialog.png
 share/doc/kde/HTML/uk/amarok/amarok2-4-1albumtageditpertrackdialog.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1configplayback.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1configscripts.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1configspeakersetup.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1configuredialog.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1configuredialogcollection.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1configuredialogplugins.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1databaseconfig.png
 share/doc/kde/HTML/uk/amarok/amarok2-4-1editfilterdialog.png
 share/doc/kde/HTML/uk/amarok/amarok2-4-1filenamelayoutchooseroptions.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1mergedviewcollection.png
 share/doc/kde/HTML/uk/amarok/amarok2-4-1non-mergedviewcollection.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1notifications.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1phononbackends.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1phonondevices.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1saveplaylistchoices.png
-share/doc/kde/HTML/uk/amarok/amarok2-4-1viewmenu.png
-share/doc/kde/HTML/uk/amarok/amarok2-4.png
-share/doc/kde/HTML/uk/amarok/amarok2-4collectionsortingmenu.png
-share/doc/kde/HTML/uk/amarok/amarok2-4helpmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-4-1tageditdialog.png
 share/doc/kde/HTML/uk/amarok/amarok2-4musicbrainztagger.png
 share/doc/kde/HTML/uk/amarok/amarok2-4organizefilesadvanceddialog.png
-share/doc/kde/HTML/uk/amarok/amarok2-4organizefilesbasicdialog.png
 share/doc/kde/HTML/uk/amarok/amarok2-4searchplaylist.png
-share/doc/kde/HTML/uk/amarok/amarok2-4transcodetracksdialog.png
+share/doc/kde/HTML/uk/amarok/amarok2-6configgeneralmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-6flactranscodemenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-6helpmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-6playlistalbumcontextmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-6trackcontextmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-6viewconfigmenu.png
+share/doc/kde/HTML/uk/amarok/amarok2-6viewundocksymbols.png
+share/doc/kde/HTML/uk/amarok/amarok2-7menutools.png
+share/doc/kde/HTML/uk/amarok/amarok2-7renamesavedplaylist.png
+share/doc/kde/HTML/uk/amarok/amarok2-7thetoolbar.png
 share/doc/kde/HTML/uk/amarok/amarok24_configureshortcutdetail.png
 share/doc/kde/HTML/uk/amarok/amarok24_configureshortcutsdialog.png
 share/doc/kde/HTML/uk/amarok/amarok24_settingsmenu.png
 share/doc/kde/HTML/uk/amarok/amarok24_settingsmenu_withreplaygain.png
 share/doc/kde/HTML/uk/amarok/amarok2_moodbar.png
+share/doc/kde/HTML/uk/amarok/amarok_2-6_layout.png
 share/doc/kde/HTML/uk/amarok/amarok_add-on_installer.png
-share/doc/kde/HTML/uk/amarok/amarok_addtoplaylist.png
 share/doc/kde/HTML/uk/amarok/amarok_addtoplaylist1.png
 share/doc/kde/HTML/uk/amarok/amarok_amarokmenu2-4.png
 share/doc/kde/HTML/uk/amarok/amarok_cover_manager.png
@@ -560,33 +553,23 @@ share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_editor.png
 share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_nog1_s.png
 share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_nog2_s.png
 share/doc/kde/HTML/uk/amarok/amarok_playlist_layout_v1_s.png
-share/doc/kde/HTML/uk/amarok/amarok_playlist_manipulation.png
 share/doc/kde/HTML/uk/amarok/amarok_playlist_search_ex.png
-share/doc/kde/HTML/uk/amarok/amarok_removeformplaylist.png
 share/doc/kde/HTML/uk/amarok/amarok_saved_playlists.png
-share/doc/kde/HTML/uk/amarok/amarok_script_info.png
 share/doc/kde/HTML/uk/amarok/amarok_show_only_matches.png
 share/doc/kde/HTML/uk/amarok/amarok_slim_toolbar.png
 share/doc/kde/HTML/uk/amarok/amarok_tracks_media_devices1.png
-share/doc/kde/HTML/uk/amarok/amarok_windowlayout.png
 share/doc/kde/HTML/uk/amarok/amarokbreadcrumb.png
+share/doc/kde/HTML/uk/amarok/amarokconfigurationdialog2-7phononbackend.png
+share/doc/kde/HTML/uk/amarok/amarokconfigurationdialog2-7phonondevice.png
+share/doc/kde/HTML/uk/amarok/amarokconfigurationdialog2-7phononhardware.png
 share/doc/kde/HTML/uk/amarok/amarokmediasources-files.png
 share/doc/kde/HTML/uk/amarok/amarokmediasources-home.png
 share/doc/kde/HTML/uk/amarok/amaroknew2-4.png
-share/doc/kde/HTML/uk/amarok/amarokrightmenu.png
 share/doc/kde/HTML/uk/amarok/amarokripcd.png
-share/doc/kde/HTML/uk/amarok/amaroksystray.png
-share/doc/kde/HTML/uk/amarok/amarokwindow_context.png
-share/doc/kde/HTML/uk/amarok/amarokwindow_mediasources.png
-share/doc/kde/HTML/uk/amarok/amarokwindow_playlist.png
 share/doc/kde/HTML/uk/amarok/apgpresetsmatchallgroup.png
-share/doc/kde/HTML/uk/amarok/app.png
 share/doc/kde/HTML/uk/amarok/bookmarking_menu.png
 share/doc/kde/HTML/uk/amarok/cd_collection_sansa.png
 share/doc/kde/HTML/uk/amarok/common
-share/doc/kde/HTML/uk/amarok/context_menu.png
-share/doc/kde/HTML/uk/amarok/contextpane.png
-share/doc/kde/HTML/uk/amarok/contextpanestopped.png
 share/doc/kde/HTML/uk/amarok/controlamarok.png
 share/doc/kde/HTML/uk/amarok/favor.png
 share/doc/kde/HTML/uk/amarok/firstruncollection2.png
@@ -597,18 +580,15 @@ share/doc/kde/HTML/uk/amarok/media_sources1.png
 share/doc/kde/HTML/uk/amarok/media_sources3.png
 share/doc/kde/HTML/uk/amarok/mediasources.png
 share/doc/kde/HTML/uk/amarok/mediasources10.png
-share/doc/kde/HTML/uk/amarok/mediasources4.png
 share/doc/kde/HTML/uk/amarok/mediasources5.png
 share/doc/kde/HTML/uk/amarok/mediasources6.png
 share/doc/kde/HTML/uk/amarok/mediasources7.png
 share/doc/kde/HTML/uk/amarok/mediasources8.png
 share/doc/kde/HTML/uk/amarok/mediasourcesex.png
-share/doc/kde/HTML/uk/amarok/new_amarok_configuration_options_general_edit.png
-share/doc/kde/HTML/uk/amarok/new_amarok_configuration_options_notifications_edit.png
+share/doc/kde/HTML/uk/amarok/metadatadialog.png
 share/doc/kde/HTML/uk/amarok/oraganize_menu.png
 share/doc/kde/HTML/uk/amarok/playlist-layout-editor-amarok.png
 share/doc/kde/HTML/uk/amarok/playlist-layout-item-configuration-amarok.png
-share/doc/kde/HTML/uk/amarok/playlist2.png
 share/doc/kde/HTML/uk/amarok/playlist_save.png
 share/doc/kde/HTML/uk/amarok/playlistlayout1.png
 share/doc/kde/HTML/uk/amarok/playlistlayout2.png
@@ -617,30 +597,21 @@ share/doc/kde/HTML/uk/amarok/playlistlayout4.png
 share/doc/kde/HTML/uk/amarok/playlistmenu.png
 share/doc/kde/HTML/uk/amarok/playlistpic.png
 share/doc/kde/HTML/uk/amarok/playlistqueue.png
-share/doc/kde/HTML/uk/amarok/playlistsearch.png
 share/doc/kde/HTML/uk/amarok/queue.png
 share/doc/kde/HTML/uk/amarok/queueend.png
 share/doc/kde/HTML/uk/amarok/remotecollections_ampache_client1.png
-share/doc/kde/HTML/uk/amarok/remotecollections_client.png
-share/doc/kde/HTML/uk/amarok/remotecollections_samba_server.png
-share/doc/kde/HTML/uk/amarok/remotecollections_samba_server1.png
-share/doc/kde/HTML/uk/amarok/remotecollections_samba_server2.png
-share/doc/kde/HTML/uk/amarok/remotecollections_samba_server3.png
-share/doc/kde/HTML/uk/amarok/searchincollection.png
 share/doc/kde/HTML/uk/amarok/searchincollection_example_editbox.png
 share/doc/kde/HTML/uk/amarok/searchincollection_example_editbox2.png
 share/doc/kde/HTML/uk/amarok/sorting.png
-share/doc/kde/HTML/uk/amarok/sorting2.png
 share/doc/kde/HTML/uk/amarok/tagedit_fromfile_advanced.png
+share/doc/kde/HTML/uk/amarok/tagedit_fromfile_advanced_example.png
 share/doc/kde/HTML/uk/amarok/tagedit_fromfile_basic.png
+share/doc/kde/HTML/uk/amarok/tagedit_fromfile_basic_example.png
 share/doc/kde/HTML/uk/amarok/toolbar_main.png
-share/doc/kde/HTML/uk/amarok/toolbar_slim.png
-share/doc/kde/HTML/uk/amarok/toolmenu.png
 share/doc/kde/HTML/uk/amarok/tools_bookmarkmanager.png
 share/doc/kde/HTML/uk/amarok/tools_covermanager.png
 share/doc/kde/HTML/uk/amarok/tools_equalizer.png
 share/doc/kde/HTML/uk/amarok/track_progression.png
-share/doc/kde/HTML/uk/amarok/transcode_1.png
 share/icons/hicolor/128x128/apps/amarok.png
 share/icons/hicolor/16x16/apps/amarok.png
 share/icons/hicolor/22x22/apps/amarok.png
@@ -651,14 +622,12 @@ share/kde/apps/amarok/amarok.notifyrc
 share/kde/apps/amarok/data/DefaultPlaylistLayouts.xml
 share/kde/apps/amarok/data/InfoAppletCustomStyle.css
 share/kde/apps/amarok/data/InfoParserLoading.html
-share/kde/apps/amarok/data/SpectrumAnalyzerAppletCustomStyle.css
 share/kde/apps/amarok/data/WikipediaCustomStyle.css
 share/kde/apps/amarok/data/bullet.gif
 share/kde/apps/amarok/data/first_run_jingle.ogg
 share/kde/apps/amarok/data/hover_info_template.html
 share/kde/apps/amarok/data/info_frontpage.html
 share/kde/apps/amarok/data/podcast_directory.opml
-share/kde/apps/amarok/data/upcoming-events-map.html
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-high-amarok.png
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-low-amarok.png
 share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-medium-amarok.png
@@ -672,18 +641,12 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playcount.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_scripts.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/clear-playlist-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/collection-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/collection-refresh-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/collection-rescan-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/download-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/dynamic-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/edit-redo-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/edit-undo-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/favorite-genres-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-album-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-artist-amarok.png
@@ -733,7 +696,6 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-media-playback-ama
 share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-multimedia-player-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-view-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/remove-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/view-media-visualization-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-amazon-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-ampache-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-gpodder-amarok.png
@@ -753,24 +715,17 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playcount.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_scripts.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/clear-playlist-amarok.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/collection-amarok.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/collection-refresh-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/collection-rescan-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/download-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/dynamic-amarok.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/edit-redo-amarok.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/edit-undo-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/filename-bpm-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/internet-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/love-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/media-album-cover-manager-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/media-album-repeat-amarok.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/media-clear-playlist-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/media-playlist-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/media-random-albums-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/media-random-tracks-amarok.png
@@ -791,7 +746,6 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-media-playback-ama
 share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-multimedia-player-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-view-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/remove-amarok.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/view-media-visualization-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-amazon-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-gpodder-amarok.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-amarok.png
@@ -813,26 +767,19 @@ share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playcount.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_scripts.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_track.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/clear-playlist-amarok.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/collection-amarok.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/collection-refresh-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/collection-rescan-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/download-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/dynamic-amarok.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/edit-redo-amarok.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/edit-undo-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/filename-bpm-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/love-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-cover-manager-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-cover.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-track.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/media-clear-playlist-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-playlist-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-random-albums-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/media-random-tracks-amarok.png
@@ -853,7 +800,6 @@ share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-media-playback-ama
 share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-multimedia-player-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-view-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/remove-amarok.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/view-media-visualization-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-amazon-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-ampache-amarok.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-gpodder-amarok.png
@@ -872,19 +818,13 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playcount.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_scripts.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/clear-playlist-amarok.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/collection-amarok.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/collection-refresh-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/collection-rescan-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/current-track-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/download-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/dynamic-amarok.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/edit-redo-amarok.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/edit-undo-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-album-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-and-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-artist-amarok.png
@@ -915,7 +855,6 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/label-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/love-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/media-album-cover-manager-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/media-album-repeat-amarok.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/media-clear-playlist-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/media-playlist-repeat-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/media-random-albums-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/media-random-tracks-amarok.png
@@ -940,7 +879,7 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/remove-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/similarartists-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/upcomingevents-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/videoclip-amarok.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-media-analyzer-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-amazon-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-gpodder-amarok.png
@@ -953,7 +892,10 @@ share/kde/apps/amarok/images/amarok-tabs-drum.png
 share/kde/apps/amarok/images/amarok-tabs-guitar.png
 share/kde/apps/amarok/images/amarok-tabs-piano.png
 share/kde/apps/amarok/images/amarok_icon.svg
+share/kde/apps/amarok/images/ball.png
 share/kde/apps/amarok/images/default-theme-clean.svg
+share/kde/apps/amarok/images/dot.png
+share/kde/apps/amarok/images/echonest.png
 share/kde/apps/amarok/images/emblem-amazon.png
 share/kde/apps/amarok/images/emblem-ampache-scalable.svgz
 share/kde/apps/amarok/images/emblem-ampache.png
@@ -979,6 +921,7 @@ share/kde/apps/amarok/images/emblem-stackoverflow.png
 share/kde/apps/amarok/images/emblem-twitter.png
 share/kde/apps/amarok/images/emblem-wikipedia.png
 share/kde/apps/amarok/images/emblem-xing.png
+share/kde/apps/amarok/images/grid.png
 share/kde/apps/amarok/images/hover_info_amazon.png
 share/kde/apps/amarok/images/hover_info_ampache.png
 share/kde/apps/amarok/images/hover_info_collections.png
@@ -986,7 +929,6 @@ share/kde/apps/amarok/images/hover_info_dynamic_playlists.png
 share/kde/apps/amarok/images/hover_info_files.png
 share/kde/apps/amarok/images/hover_info_internet.png
 share/kde/apps/amarok/images/hover_info_jamendo.png
-share/kde/apps/amarok/images/hover_info_lastfm.png
 share/kde/apps/amarok/images/hover_info_magnatune.png
 share/kde/apps/amarok/images/hover_info_playlists.png
 share/kde/apps/amarok/images/hover_info_podcasts.png
@@ -995,10 +937,7 @@ share/kde/apps/amarok/images/info_frontpage_bg.png
 share/kde/apps/amarok/images/info_frontpage_logo.png
 share/kde/apps/amarok/images/info_frontpage_shadow.png
 share/kde/apps/amarok/images/lastfm-default-cover.png
-share/kde/apps/amarok/images/likeback_bug.png
-share/kde/apps/amarok/images/likeback_dislike.png
-share/kde/apps/amarok/images/likeback_feature.png
-share/kde/apps/amarok/images/likeback_like.png
+share/kde/apps/amarok/images/lastfm.png
 share/kde/apps/amarok/images/loading1.png
 share/kde/apps/amarok/images/loading2.png
 share/kde/apps/amarok/images/mb_aicon.png
@@ -1024,10 +963,11 @@ share/kde/apps/amarok/images/service_info_loading7.png
 share/kde/apps/amarok/images/service_info_loading8.png
 share/kde/apps/amarok/images/service_info_loading9.png
 share/kde/apps/amarok/images/smallstar.png
-share/kde/apps/amarok/images/splash_screen.jpg
 share/kde/apps/amarok/images/star.png
 share/kde/apps/amarok/images/volume_icon.png
 share/kde/apps/amarok/images/volume_muted_icon.png
+share/kde/apps/amarok/images/wirl1.png
+share/kde/apps/amarok/images/wirl2.png
 share/kde/apps/amarok/scripts/free_music_charts_service/FMCEmblem.png
 share/kde/apps/amarok/scripts/free_music_charts_service/FMCIcon.png
 share/kde/apps/amarok/scripts/free_music_charts_service/FMCShow.png
@@ -1052,7 +992,6 @@ share/kde/apps/amarok/scripts/script_console/script.spec
 share/kde/apps/desktoptheme/default/widgets/amarok-albums.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-currenttrack.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-info-applet.svg
-share/kde/apps/desktoptheme/default/widgets/amarok-spectrum-analyzer-applet.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
 share/kde/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
 share/kde/apps/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
@@ -1065,28 +1004,21 @@ share/kde/config/amarokapplets.knsrc
 share/kde4/services/ServiceMenus/amarok_append.desktop
 share/kde4/services/amarok-containment-vertical.desktop
 share/kde4/services/amarok-context-applet-albums.desktop
+share/kde4/services/amarok-context-applet-analyzer.desktop
 share/kde4/services/amarok-context-applet-currenttrack.desktop
 share/kde4/services/amarok-context-applet-info.desktop
 share/kde4/services/amarok-context-applet-labels.desktop
 share/kde4/services/amarok-context-applet-lyrics.desktop
 share/kde4/services/amarok-context-applet-photos.desktop
-share/kde4/services/amarok-context-applet-similarArtists.desktop
-share/kde4/services/amarok-context-applet-spectrum-analyzer.desktop
 share/kde4/services/amarok-context-applet-tabs.desktop
-share/kde4/services/amarok-context-applet-upcomingEvents.desktop
 share/kde4/services/amarok-context-applet-wikipedia.desktop
 share/kde4/services/amarok-data-engine-current.desktop
 share/kde4/services/amarok-data-engine-info.desktop
 share/kde4/services/amarok-data-engine-labels.desktop
 share/kde4/services/amarok-data-engine-lyrics.desktop
 share/kde4/services/amarok-data-engine-photos.desktop
-share/kde4/services/amarok-data-engine-similarArtists.desktop
-share/kde4/services/amarok-data-engine-spectrum-analyzer.desktop
 share/kde4/services/amarok-data-engine-tabs.desktop
-share/kde4/services/amarok-data-engine-upcomingEvents.desktop
 share/kde4/services/amarok-data-engine-wikipedia.desktop
-share/kde4/services/amarok-scriptengine-applet-simple-javascript.desktop
-share/kde4/services/amarok-scriptengine-runner-javascript.desktop
 share/kde4/services/amarok.protocol
 share/kde4/services/amarok_collection-audiocdcollection.desktop
 share/kde4/services/amarok_collection-daapcollection.desktop
@@ -1094,167 +1026,137 @@ share/kde4/services/amarok_collection-ipodcollection.desktop
 share/kde4/services/amarok_collection-mtpcollection.desktop
 share/kde4/services/amarok_collection-mysqlecollection.desktop
 share/kde4/services/amarok_collection-mysqlservercollection.desktop
+share/kde4/services/amarok_collection-nepomukcollection.desktop
 share/kde4/services/amarok_collection-playdarcollection.desktop
 share/kde4/services/amarok_collection-umscollection.desktop
 share/kde4/services/amarok_collection-upnpcollection.desktop
-share/kde4/services/amarok_device_massstorage.desktop
-share/kde4/services/amarok_device_nfs.desktop
-share/kde4/services/amarok_device_smb.desktop
 share/kde4/services/amarok_service_amazonstore.desktop
 share/kde4/services/amarok_service_amazonstore_config.desktop
 share/kde4/services/amarok_service_ampache.desktop
 share/kde4/services/amarok_service_ampache_config.desktop
 share/kde4/services/amarok_service_jamendo.desktop
-share/kde4/services/amarok_service_lastfm.desktop
-share/kde4/services/amarok_service_lastfm_config.desktop
 share/kde4/services/amarok_service_magnatunestore.desktop
 share/kde4/services/amarok_service_magnatunestore_config.desktop
 share/kde4/services/amarok_service_mp3tunes.desktop
 share/kde4/services/amarok_service_mp3tunes_config.desktop
 share/kde4/services/amarok_service_opmldirectory.desktop
 share/kde4/services/amarokitpc.protocol
-share/kde4/services/amaroklastfm.protocol
 share/kde4/servicetypes/amarok_codecinstall.desktop
 share/kde4/servicetypes/amarok_context_applet.desktop
 share/kde4/servicetypes/amarok_data_engine.desktop
 share/kde4/servicetypes/amarok_plugin.desktop
 share/locale/bs/LC_MESSAGES/amarok.mo
-share/locale/bs/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/bs/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/bs/LC_MESSAGES/amarokpkg.mo
 share/locale/ca/LC_MESSAGES/amarok.mo
-share/locale/ca/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/ca/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/ca/LC_MESSAGES/amarokpkg.mo
 share/locale/ca@valencia/LC_MESSAGES/amarok.mo
-share/locale/ca@valencia/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/ca@valencia/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/ca@valencia/LC_MESSAGES/amarokpkg.mo
 share/locale/cs/LC_MESSAGES/amarok.mo
-share/locale/cs/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/cs/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/cs/LC_MESSAGES/amarokpkg.mo
 share/locale/da/LC_MESSAGES/amarok.mo
-share/locale/da/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/da/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/da/LC_MESSAGES/amarokpkg.mo
 share/locale/de/LC_MESSAGES/amarok.mo
-share/locale/de/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/de/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/de/LC_MESSAGES/amarokpkg.mo
 share/locale/el/LC_MESSAGES/amarok.mo
-share/locale/el/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/el/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/el/LC_MESSAGES/amarokpkg.mo
 share/locale/en_GB/LC_MESSAGES/amarok.mo
-share/locale/en_GB/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/en_GB/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/en_GB/LC_MESSAGES/amarokpkg.mo
 share/locale/es/LC_MESSAGES/amarok.mo
-share/locale/es/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/es/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/es/LC_MESSAGES/amarokpkg.mo
 share/locale/et/LC_MESSAGES/amarok.mo
-share/locale/et/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/et/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/et/LC_MESSAGES/amarokpkg.mo
 share/locale/eu/LC_MESSAGES/amarok.mo
-share/locale/eu/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/eu/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/eu/LC_MESSAGES/amarokpkg.mo
 share/locale/fi/LC_MESSAGES/amarok.mo
-share/locale/fi/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/fi/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/fi/LC_MESSAGES/amarokpkg.mo
+share/locale/fr/LC_MESSAGES/amarok.mo
+share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/fr/LC_MESSAGES/amarokpkg.mo
 share/locale/ga/LC_MESSAGES/amarok.mo
-share/locale/ga/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/ga/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/ga/LC_MESSAGES/amarokpkg.mo
 share/locale/gl/LC_MESSAGES/amarok.mo
-share/locale/gl/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/gl/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/gl/LC_MESSAGES/amarokpkg.mo
 share/locale/hu/LC_MESSAGES/amarok.mo
-share/locale/hu/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/hu/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/hu/LC_MESSAGES/amarokpkg.mo
-share/locale/ia/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/it/LC_MESSAGES/amarok.mo
-share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/it/LC_MESSAGES/amarokpkg.mo
 share/locale/ja/LC_MESSAGES/amarok.mo
-share/locale/ja/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/ja/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/ja/LC_MESSAGES/amarokpkg.mo
 share/locale/lt/LC_MESSAGES/amarok.mo
-share/locale/lt/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/lt/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/lt/LC_MESSAGES/amarokpkg.mo
 share/locale/lv/LC_MESSAGES/amarok.mo
-share/locale/lv/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/lv/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/lv/LC_MESSAGES/amarokpkg.mo
 share/locale/nb/LC_MESSAGES/amarok.mo
-share/locale/nb/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/nb/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/nb/LC_MESSAGES/amarokpkg.mo
 share/locale/nl/LC_MESSAGES/amarok.mo
-share/locale/nl/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/nl/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/nl/LC_MESSAGES/amarokpkg.mo
 share/locale/pa/LC_MESSAGES/amarok.mo
 share/locale/pa/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/pa/LC_MESSAGES/amarokpkg.mo
 share/locale/pl/LC_MESSAGES/amarok.mo
-share/locale/pl/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/pl/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/pl/LC_MESSAGES/amarokpkg.mo
 share/locale/pt/LC_MESSAGES/amarok.mo
-share/locale/pt/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/pt/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/pt/LC_MESSAGES/amarokpkg.mo
 share/locale/pt_BR/LC_MESSAGES/amarok.mo
-share/locale/pt_BR/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/pt_BR/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/pt_BR/LC_MESSAGES/amarokpkg.mo
+share/locale/ro/LC_MESSAGES/amarok.mo
+share/locale/ro/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ro/LC_MESSAGES/amarokpkg.mo
 share/locale/ru/LC_MESSAGES/amarok.mo
-share/locale/ru/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/ru/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/ru/LC_MESSAGES/amarokpkg.mo
 share/locale/sl/LC_MESSAGES/amarok.mo
-share/locale/sl/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sl/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sl/LC_MESSAGES/amarokpkg.mo
 share/locale/sr/LC_MESSAGES/amarok.mo
-share/locale/sr/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sr/LC_MESSAGES/amarokpkg.mo
 share/locale/sr@ijekavian/LC_MESSAGES/amarok.mo
-share/locale/sr@ijekavian/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr@ijekavian/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sr@ijekavian/LC_MESSAGES/amarokpkg.mo
 share/locale/sr@ijekavianlatin/LC_MESSAGES/amarok.mo
-share/locale/sr@ijekavianlatin/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr@ijekavianlatin/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sr@ijekavianlatin/LC_MESSAGES/amarokpkg.mo
 share/locale/sr@latin/LC_MESSAGES/amarok.mo
-share/locale/sr@latin/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sr@latin/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sr@latin/LC_MESSAGES/amarokpkg.mo
 share/locale/sv/LC_MESSAGES/amarok.mo
-share/locale/sv/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/sv/LC_MESSAGES/amarokpkg.mo
+share/locale/tr/LC_MESSAGES/amarok.mo
+share/locale/tr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/tr/LC_MESSAGES/amarokpkg.mo
 share/locale/uk/LC_MESSAGES/amarok.mo
-share/locale/uk/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/uk/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/uk/LC_MESSAGES/amarokpkg.mo
 share/locale/zh_CN/LC_MESSAGES/amarok.mo
-share/locale/zh_CN/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/zh_CN/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/zh_CN/LC_MESSAGES/amarokpkg.mo
 share/locale/zh_TW/LC_MESSAGES/amarok.mo
-share/locale/zh_TW/LC_MESSAGES/amarok_scriptengine_qscript.mo
 share/locale/zh_TW/LC_MESSAGES/amarokcollectionscanner_qt.mo
 share/locale/zh_TW/LC_MESSAGES/amarokpkg.mo
+share/mime/packages/amzdownloader.xml
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 67034a21b93..6a17cd22a35 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.50 2012/11/17 22:04:19 markd Exp $
+$NetBSD: distinfo,v 1.51 2013/11/18 10:53:44 markd Exp $
 
-SHA1 (amarok-2.6.0.tar.bz2) = 2cfcdabb67436418ba0012075ba105bbb630b48d
-RMD160 (amarok-2.6.0.tar.bz2) = 89b8e3a56390dc240efc7dddd8e97ac9e4a03127
-Size (amarok-2.6.0.tar.bz2) = 42331208 bytes
+SHA1 (amarok-2.8.0.tar.bz2) = e76ccd53c05d57f9457d74cd08c2c41383c00937
+RMD160 (amarok-2.8.0.tar.bz2) = 06dd81447ed85e211ed741c06f189a2a355e824d
+Size (amarok-2.8.0.tar.bz2) = 39950028 bytes
 SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1
 SHA1 (patch-cmake_modules_FindTagLib.cmake) = 95e195ea376746dbbc16c3fdc88b934cf711199f
-SHA1 (patch-src_context_widgets_RatingWidget.cpp) = 67d84170eacbd139ffa1f8159ad941f0f369a44a
-SHA1 (patch-src_dialogs_TagDialogBase.ui) = f81f7832ed0dbb4b635162dca2ef7d2145d6cd14
-SHA1 (patch-src_playlist_view_listview_PrettyItemDelegate.cpp) = 1c8f8c2d310b6ad08b2894d0941000b0935adc9f
-SHA1 (patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui) = d11a057fd51ee9c00fef47ffdd3c66ff8fd0995b
diff --git a/audio/amarok/patches/patch-src_context_widgets_RatingWidget.cpp b/audio/amarok/patches/patch-src_context_widgets_RatingWidget.cpp
deleted file mode 100644
index efe83f32fba..00000000000
--- a/audio/amarok/patches/patch-src_context_widgets_RatingWidget.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_context_widgets_RatingWidget.cpp,v 1.1 2012/03/20 10:28:29 markd Exp $
-
---- src/context/widgets/RatingWidget.cpp.orig	2011-12-15 07:36:48.000000000 +0000
-+++ src/context/widgets/RatingWidget.cpp
-@@ -39,7 +39,7 @@
- #include <klocale.h>
- #include <kstandarddirs.h>
- 
--using namespace Amarok;
-+// using namespace Amarok;
- 
- class RatingWidget::Private
- {
diff --git a/audio/amarok/patches/patch-src_dialogs_TagDialogBase.ui b/audio/amarok/patches/patch-src_dialogs_TagDialogBase.ui
deleted file mode 100644
index 4231d010cda..00000000000
--- a/audio/amarok/patches/patch-src_dialogs_TagDialogBase.ui
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_dialogs_TagDialogBase.ui,v 1.1 2012/03/20 10:28:29 markd Exp $
-
---- src/dialogs/TagDialogBase.ui.orig	2011-12-15 07:36:48.000000000 +0000
-+++ src/dialogs/TagDialogBase.ui
-@@ -376,7 +376,7 @@
-             </widget>
-            </item>
-            <item row="2" column="3">
--            <widget class="Amarok::KRatingWidget" name="ratingWidget">
-+            <widget class="KRatingWidget" name="ratingWidget">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-                <horstretch>0</horstretch>
diff --git a/audio/amarok/patches/patch-src_playlist_view_listview_PrettyItemDelegate.cpp b/audio/amarok/patches/patch-src_playlist_view_listview_PrettyItemDelegate.cpp
deleted file mode 100644
index bf97f965fd2..00000000000
--- a/audio/amarok/patches/patch-src_playlist_view_listview_PrettyItemDelegate.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_playlist_view_listview_PrettyItemDelegate.cpp,v 1.1 2012/03/20 10:28:29 markd Exp $
-
---- src/playlist/view/listview/PrettyItemDelegate.cpp.orig	2011-12-15 07:36:48.000000000 +0000
-+++ src/playlist/view/listview/PrettyItemDelegate.cpp
-@@ -460,7 +460,7 @@ void Playlist::PrettyItemDelegate::paint
-                 else
-                     ratingAlignment = Qt::AlignCenter;
- 
--                Amarok::KRatingPainter::paintRating( painter, QRect( currentItemX, rowOffsetY, itemWidth, rowHeight ), ratingAlignment, rating, rating );
-+                KRatingPainter::paintRating( painter, QRect( currentItemX, rowOffsetY, itemWidth, rowHeight ), ratingAlignment, rating, rating );
- 
-             }
-             else if ( value == Divider )
diff --git a/audio/amarok/patches/patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui b/audio/amarok/patches/patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui
deleted file mode 100644
index d429f9af9e0..00000000000
--- a/audio/amarok/patches/patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_playlistgenerator_constraints_TagMatchEditWidget.ui,v 1.1 2012/03/20 10:28:29 markd Exp $
-
---- src/playlistgenerator/constraints/TagMatchEditWidget.ui.orig	2011-12-15 07:36:48.000000000 +0000
-+++ src/playlistgenerator/constraints/TagMatchEditWidget.ui
-@@ -619,7 +619,7 @@ p, li { white-space: pre-wrap; }
-               <item row="0" column="1">
-                <layout class="QHBoxLayout" name="horizontalLayout_3">
-                 <item>
--                 <widget class="Amarok::KRatingWidget" name="rating_RatingValue">
-+                 <widget class="KRatingWidget" name="rating_RatingValue">
-                   <property name="whatsThis">
-                    <string>The rating that the APG should try to match.</string>
-                   </property>