Update to 2.4.0.

VERSION 2.4.0
  CHANGES:
    * New Splash Screen by Tomasz Dudzik <madsheytan@gmail.com>.
    * The "Playdar Collection" feature has been disabled until some technical
      issues are resolved.
    * Fixed some broken radio stream URLs.

  BUGFIXES:
    * Fix crash on copying tracks between collection. (BR 261364)
    * Fix fetching of script data. BBC, Free Music Charts and others should work again.
      (BR 261839)
    * Actually show the Splash Screen by default, as it was meant to work.
    * Leave all pending files in case of error/conflict during tracks moving. (BR 257739)
    * Fix crash when moving tracks between collections. (BR 253033)
    * Fixed issue with UMS Collection that made amarok to delete original track
      instead of newly copied one. (BR 238915)
    * Fixed issue with Audio CDs that do not provide CDDB information. Patch by
      Andriy Gapon <avg@icyb.net.ua>. (BR 257818)
    * Fixed issue with the Organize Files Dialog that prevented presets from being
      loaded when in advanced mode. Patch by Philipp Schmidt <philschmidt@gmx.net>.
      (BR 255325)


VERSION 2.4-Beta 1
  FEATURES:
    * New UPnP Collection detects and plays media on UPnP devices on the network.
    * New transcoding feature which converts one or more tracks with a chosen encoder
      when copying to the local collection.
    * Added option to use Wikipedia Mobile.
    * Added settings for writing statistics and album covers back to the file.
    * Leave focus in playlist search widget when using up/down to scroll through
      filtered results. Thanks to Thomas Karpiniec for the patch!
    * LyricsApplet: The lyrics in are now updated when they were changed in a
      different place, for example in the Tag Dialog.
    * Permit the use of iPod Touch 3G and possibly newer devices. Thanks to
      Aurélien Croc for the patch!
    * Match space-separated search terms in the playlist filter var individually. Thanks
      to Thomas Karpiniec for the patch!
    * Added new context applet for displaying guitar and bass tab information. Thanks to
      Rainer Sigle for the patch!
    * Added ability to set/update Album Artist.
    * Added map view and calendar in the upcoming events applet.
    * Added support for all Wikipedia languages. (BR 220617)
    * Added incremental search in the Wikipedia applet (press
      '/' or global search key when in focus).
    * Added "Favorite Venues" to the upcoming events applet.
    * Read MusicBrainz IDs of MP4 files during scanning.
    * Ability to hide and show the menu bar. Patch by
      Valentyn Pavliuchenko <valentyn.pavliuchenko@gmail.com>.
    * Size of the On-Screen-Display font is now configurable. (BR 195186)
    * Musicbrainz-based mass tagging UI by Sergey Ivanov.
    * New easy to use table-based UI for Ampache server configuration. (BR 200703)
    * OPML export for podcast subscriptions. (BR 126120)
    * New "Playlist Length" constraint for the APG, which allows you to specify
      the number of tracks in the playlist.  What was the "Playlist Length "
      constraint is now called "Playlist Duration".
    * MPRIS2 support for controlling Amarok over D-Bus.
    * New "Playdar Collection" allows searching for and listening
      to music provided by a running local Playdar service.

  CHANGES:
    * Brought back collapsing animations of context applets.
    * Added a "Donors" tab to the About dialog for our generous Roktober 2010
      donors who wish to be mentioned.
    * Tracks might contain lyrics in the HTML format, where there's no user-visible
      content in the HTML. Those lyrics are now regarded as "empty".
    * LyricsApplet: changed the layout of the "Do you really want to refetch lyrics"
      message.
    * Current track applet: added "show in media sources" actions for current
      track's artist, album, composer, genre, and year if available.
    * Current track applet: added action to open the tag dialog.
    * Improved appearance of current track applet when playback is stopped.
    * Better scrolling in the applet explorer.
    * The default moodbar style now uses system colors.
    * Added tray icon context-menu action to open the preferences dialog.
    * Show a progress bar while loading pages in the Wikipedia applet.
    * Added option to right-align "year" in the albums applet.
    * Improved alignment of tracks in the albums applet.
    * Scroll to the current album and make its tracks visible in the albums
      applet. (BR 187011)
    * Added ability to expand/collapse/drag disc items in the albums applet.
      (BR 249488)
    * Improved appearance of similar artist, upcoming events, and Wikipedia
      applets.
    * Improved presentation of suggested lyrics (currently only 3rd party
      scripts use).
    * Now using QToolTip for playlist tooltips.
    * Changed playlist delegate margins and inline editor formating.
    * Added "Added This Hour" filter preset to the collection brower widget.
    * Bumped KDE dependency to version 4.4., and Qt dependency to 4.6.
    * Print message when a file can't be copied to a media player.
      Patch by Sergey Ivanov <123kash@gmail.com>. (BR 203820)
    * Improved the usability of device items in Media Sources by adding tooltips.
    * Deleting items in the collection/file browser will move them to trash;
      pressing SHIFT while clicking the action will bypass trash.

  BUGFIXES:
    * Fixed white text on light blue background in tabs applet. (BR 258234)
    * Fixed cover dialog crash pressing Ok when nothing is selected. (BR 258187)
    * Title labels incorrectly used the text color from the plasma theme.
      This caused trouble with the fixed plasma theme and light color schemes.
    * Fixed a data-loss bug where the user could lose changes he made to the current
      track's lyrics. (BR 207621)
    * Fixed covers of Ampache tracks not available through DBus.
    * Scanning stale and orphaned songs on iPod results in song duplication. (BR 235696)
    * Applets' settings dialogs were partly untranslatable. (BR 255971)
    * Fixed append&play action. Thanks Pieter van der Kloet for the patch. (BR 229706)
    * Don't ignore the "use relative path" checkbox in the playlist export dialog.
      (BR 250689)
    * Fixed applet explorer getting stuck. (BR 253058)
    * Fixed Wikipedia applet header layout issues. (BR 215171)
    * Fixed truncated heading in albums applet. (BR 231001)
    * Playlist sorting breadcrumb items have been untranslatable.
      Patch by Alexander Potashev <aspotashev@gmail.com>. (BR 189750)
    * Dynamic Playlist criteria were not being saved properly. (BR 243562)
    * Collection Browser should show Artist names for Compilation Albums. (BR
      252790)
    * When Amarok starts and "Continue playing when Amarok is started" is selected,
      the Current Track applet showed songs of the artist instead of the current
      track info. Patch by Conrad Hübler. (BR 241641)
    * Fixed crash on Windows when exporting playlist to any file type. Patch by
      James Duncan <james.t.duncan@gmail.com>. (BR 249376)
    * If album keyword is empty, show "unknown album" in context window. (BR 205038)
    * Ampache would not connect to servers placed in a subdirectory.
    * Fixed an initialization bug which affected all context applets.
    * Fixed bug where users could drag applets around indiscriminately.
    * FLAC BPM tags could be read incorrectly. (BR 234166)


==BEGIN Qt 4.6 / KDE 4.4 DEPENDENCY==

9 files changed, 98 insertions, 261 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 8a4d462e4e5..b7540843b92 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.93 2011/01/13 13:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.94 2011/01/27 17:24:18 wiz Exp $
 #
 
 DISTNAME=	amarok-${VERS}
-VERS=		2.3.2
-PKGREVISION=	6
+VERS=		2.4.0
 CATEGORIES=	audio multimedia
 #MASTER_SITES=	http://download.kde.org/unstable/amarok/${VERS}/src/ \
 #		ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
@@ -35,13 +34,14 @@ SUBST_CLASSES+=		mysql
 SUBST_STAGE.mysql=	post-patch
 SUBST_MESSAGE.mysql=	Fixup paths for MySQL embedded
 SUBST_FILES.mysql=	cmake/modules/FindMySQLAmarok.cmake
-SUBST_FILES.mysql+=	src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt
+SUBST_FILES.mysql+=	src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt
 SUBST_SED.mysql=	-e s:/opt/mysqle/:${BUILDLINK_PREFIX.mysql-server}:
 SUBST_SED.mysql+=	-e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-server}/lib/mysql:
 
 .include "options.mk"
 
 .include "../../audio/liblastfm/buildlink3.mk"
+.include "../../audio/libofa/buildlink3.mk"
 BUILDLINK_API_DEPENDS.taglib+=	taglib>=1.6nb1
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../audio/taglib-extras/buildlink3.mk"
@@ -52,6 +52,7 @@ BUILDLINK_API_DEPENDS.mysql-server+=	mysql-server>=5.1.44nb1
 .include "../../devel/qtscriptgenerator/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/kdemultimedia4/buildlink3.mk"
 .include "../../security/qca2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index c9703f8c3d7..42bf9a5c5f9 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2010/10/27 07:59:32 wiz Exp $
+@comment $NetBSD: PLIST,v 1.38 2011/01/27 17:24:18 wiz Exp $
 bin/amarok
 bin/amarok_afttagger
 bin/amarokcollectionscanner
@@ -11,7 +11,9 @@ 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-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_currenttrack.so
@@ -20,6 +22,7 @@ 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_tabs.so
 lib/kde4/amarok_context_applet_upcomingEvents.so
 lib/kde4/amarok_context_applet_videoclip.so
 lib/kde4/amarok_context_applet_wikipedia.so
@@ -29,6 +32,7 @@ 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_tabs.so
 lib/kde4/amarok_data_engine_upcomingEvents.so
 lib/kde4/amarok_data_engine_videoclip.so
 lib/kde4/amarok_data_engine_wikipedia.so
@@ -47,6 +51,9 @@ lib/kde4/kcm_amarok_service_mp3tunes.so
 lib/libamarok-sqlcollection.so
 lib/libamarok-sqlcollection.so.1
 lib/libamarok-sqlcollection.so.1.0.0
+lib/libamarok-transcoding.so
+lib/libamarok-transcoding.so.1
+lib/libamarok-transcoding.so.1.0.0
 lib/libamarokcore.so
 lib/libamarokcore.so.1
 lib/libamarokcore.so.1.0.0
@@ -59,31 +66,64 @@ lib/libamarokocsclient.so.4.5.0
 lib/libamarokpud.so
 lib/libamarokpud.so.1
 lib/libamarokpud.so.1.0.0
-lib/strigi/strigita_audible.so
-lib/strigi/strigita_mp4.so
+lib/libamarokqtjson.so
+lib/libamarokqtjson.so.1
+lib/libamarokqtjson.so.1.0.0
+lib/libampache_account_login.so
 share/applications/kde4/amarok.desktop
 share/applications/kde4/amarok_containers.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
+share/dbus-1/interfaces/org.kde.amarok.App.xml
 share/dbus-1/interfaces/org.kde.amarok.Collection.xml
-share/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml
+share/dbus-1/interfaces/org.kde.amarok.Mpris1Extensions.Player.xml
+share/dbus-1/interfaces/org.kde.amarok.Mpris2Extensions.Player.xml
 share/doc/kde/HTML/de/amarok/common
 share/doc/kde/HTML/de/amarok/index.cache.bz2
 share/doc/kde/HTML/de/amarok/index.docbook
-share/doc/kde/HTML/en/amarok/Amarok2.1center.png
-share/doc/kde/HTML/en/amarok/Amarok2.1contextviewconfig.png
+share/doc/kde/HTML/en/amarok/Addingmusic.png
+share/doc/kde/HTML/en/amarok/Amarok-addingmusic2.png
+share/doc/kde/HTML/en/amarok/Amarok-context.png
+share/doc/kde/HTML/en/amarok/Amarok-contextadd.png
+share/doc/kde/HTML/en/amarok/Amarok-removefromplaylist.png
+share/doc/kde/HTML/en/amarok/Amarok-renameplaylist.png
 share/doc/kde/HTML/en/amarok/Amarok2.1covermanager.png
 share/doc/kde/HTML/en/amarok/Amarok2.1dynamicplaylist.png
-share/doc/kde/HTML/en/amarok/Amarok2.1internetservices.png
 share/doc/kde/HTML/en/amarok/Amarok2.1ipod.png
-share/doc/kde/HTML/en/amarok/Amarok2.1left.png
 share/doc/kde/HTML/en/amarok/Amarok2.1pleditor.png
-share/doc/kde/HTML/en/amarok/Amarok2.1popup.png
 share/doc/kde/HTML/en/amarok/Amarok2.1rating.png
 share/doc/kde/HTML/en/amarok/Amarok2.1right.png
 share/doc/kde/HTML/en/amarok/Amarok2.1scriptmanager.png
-share/doc/kde/HTML/en/amarok/Amarok2.1svn965006.png
+share/doc/kde/HTML/en/amarok/Amarok_-_internet_services.png
+share/doc/kde/HTML/en/amarok/Amarokbreadcrumb.png
+share/doc/kde/HTML/en/amarok/Amarokcollection.png
+share/doc/kde/HTML/en/amarok/Amarokfull.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/Amarokrightmenu.png
+share/doc/kde/HTML/en/amarok/Amarokripcd.png
+share/doc/kde/HTML/en/amarok/Amaroksystray.png
+share/doc/kde/HTML/en/amarok/Applications-internet.png
+share/doc/kde/HTML/en/amarok/Cd_collection_sansa.png
+share/doc/kde/HTML/en/amarok/Configurecollection.png
+share/doc/kde/HTML/en/amarok/Context-applets-amarok.png
+share/doc/kde/HTML/en/amarok/Controlamarok.png
+share/doc/kde/HTML/en/amarok/Document-save.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/Firstruncollection2.png
+share/doc/kde/HTML/en/amarok/Folder-amarok.png
+share/doc/kde/HTML/en/amarok/Hi32-action-collection-amarok.png
+share/doc/kde/HTML/en/amarok/Hi48-action-clear-playlist-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/Mediasources.png
+share/doc/kde/HTML/en/amarok/Preferences-other.png
+share/doc/kde/HTML/en/amarok/Pud-amarok.png
+share/doc/kde/HTML/en/amarok/View-list-tree.png
+share/doc/kde/HTML/en/amarok/View-media-playlist.png
 share/doc/kde/HTML/en/amarok/common
 share/doc/kde/HTML/en/amarok/index.cache.bz2
 share/doc/kde/HTML/en/amarok/index.docbook
@@ -169,19 +209,29 @@ share/doc/kde/HTML/sv/amarok/index.docbook
 share/doc/kde/HTML/sv/amarok/quick.docbook
 share/doc/kde/HTML/sv/amarok/requirements.docbook
 share/doc/kde/HTML/sv/amarok/using.docbook
-share/doc/kde/HTML/uk/amarok/Amarok2.1center.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1contextviewconfig.png
+share/doc/kde/HTML/uk/amarok/Addingmusic.png
+share/doc/kde/HTML/uk/amarok/Amarok-context.png
+share/doc/kde/HTML/uk/amarok/Amarok-contextadd.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1covermanager.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1dynamicplaylist.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1internetservices.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1ipod.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1left.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1pleditor.png
-share/doc/kde/HTML/uk/amarok/Amarok2.1popup.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1rating.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1right.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1scriptmanager.png
 share/doc/kde/HTML/uk/amarok/Amarok2.1svn965006.png
+share/doc/kde/HTML/uk/amarok/Amarok_-_context_view_configuration.png
+share/doc/kde/HTML/uk/amarok/Amarok_-_internet_services.png
+share/doc/kde/HTML/uk/amarok/Amarokbreadcrumb.png
+share/doc/kde/HTML/uk/amarok/Amarokcollection.png
+share/doc/kde/HTML/uk/amarok/Amarokfull.png
+share/doc/kde/HTML/uk/amarok/Amarokmediasources-home.png
+share/doc/kde/HTML/uk/amarok/Amarokrightmenu.png
+share/doc/kde/HTML/uk/amarok/Amarokripcd.png
+share/doc/kde/HTML/uk/amarok/Configurecollection.png
+share/doc/kde/HTML/uk/amarok/Context-applets-amarok.png
+share/doc/kde/HTML/uk/amarok/Firstruncollection2.png
+share/doc/kde/HTML/uk/amarok/Mediasources.png
 share/doc/kde/HTML/uk/amarok/common
 share/doc/kde/HTML/uk/amarok/index.cache.bz2
 share/doc/kde/HTML/uk/amarok/index.docbook
@@ -200,6 +250,7 @@ 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/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
@@ -243,7 +294,7 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-title-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-track-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-underscore-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-year-amarok.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-loved-radio-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-mix-radio-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-neighbour-radio-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-personal-radio-amarok.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-recommended-radio-amarok.png
@@ -454,6 +505,7 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-track-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-underscore-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-year-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/info-amarok.png
+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
@@ -494,6 +546,10 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-lastfm-amarok.pn
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-magnatune-amarok.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-mp3tunes-amarok.png
 share/kde/apps/amarok/images/FilenameLayoutDialogHint.png
+share/kde/apps/amarok/images/amarok-tabs-bass.png
+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-videoclip-dailymotion.png
 share/kde/apps/amarok/images/amarok-videoclip-vimeo.png
 share/kde/apps/amarok/images/amarok-videoclip-youtube.png
@@ -542,6 +598,9 @@ share/kde/apps/amarok/images/likeback_feature.png
 share/kde/apps/amarok/images/likeback_like.png
 share/kde/apps/amarok/images/loading1.png
 share/kde/apps/amarok/images/loading2.png
+share/kde/apps/amarok/images/mb_aicon.png
+share/kde/apps/amarok/images/mb_licon.png
+share/kde/apps/amarok/images/mb_ticon.png
 share/kde/apps/amarok/images/navigation_arrows.svg
 share/kde/apps/amarok/images/nocover.png
 share/kde/apps/amarok/images/opendesktop-22.png
@@ -605,6 +664,7 @@ 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-tabs.desktop
 share/kde4/services/amarok-context-applet-upcomingEvents.desktop
 share/kde4/services/amarok-context-applet-videoclip.desktop
 share/kde4/services/amarok-context-applet-wikipedia.desktop
@@ -614,6 +674,7 @@ 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-tabs.desktop
 share/kde4/services/amarok-data-engine-upcomingEvents.desktop
 share/kde4/services/amarok-data-engine-videoclip.desktop
 share/kde4/services/amarok-data-engine-wikipedia.desktop
@@ -626,7 +687,9 @@ 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-playdarcollection.desktop
 share/kde4/services/amarok_collection-umscollection.desktop
+share/kde4/services/amarok_collection-upnpcollection.desktop
 share/kde4/services/amarok_massstorage-device.desktop
 share/kde4/services/amarok_service_ampache.desktop
 share/kde4/services/amarok_service_ampache_config.desktop
@@ -644,11 +707,6 @@ 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/af/LC_MESSAGES/amarok.mo
-share/locale/bg/LC_MESSAGES/amarok.mo
-share/locale/bg/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/bg/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/bg/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
@@ -669,10 +727,6 @@ 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
@@ -744,10 +798,6 @@ 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/sk/LC_MESSAGES/amarok.mo
-share/locale/sk/LC_MESSAGES/amarok_scriptengine_qscript.mo
-share/locale/sk/LC_MESSAGES/amarokcollectionscanner_qt.mo
-share/locale/sk/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
@@ -772,13 +822,17 @@ 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/th/LC_MESSAGES/amarok.mo
-share/locale/th/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/wa/LC_MESSAGES/amarok.mo
+share/locale/wa/LC_MESSAGES/amarokcollectionscanner_qt.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
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 059216f0682..44c5a82fb30 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.45 2010/10/29 09:28:12 wiz Exp $
+$NetBSD: distinfo,v 1.46 2011/01/27 17:24:18 wiz Exp $
 
-SHA1 (amarok-2.3.2.tar.bz2) = 594d6d3ad57832fb80ba4387459356132d37ace2
-RMD160 (amarok-2.3.2.tar.bz2) = 3c2a7868fb7b3f74e35e124cf3a8bad5d8653390
-Size (amarok-2.3.2.tar.bz2) = 13948250 bytes
-SHA1 (patch-aa) = da74bc41dc18286cabef82fef9b5aa4f738e8ad5
-SHA1 (patch-ab) = 152a6c0516dcab316c4f90480f1bb7fb46eabfbe
-SHA1 (patch-ac) = 22c385f4633a828dd6b812e461836c1a1284c1a6
-SHA1 (patch-ad) = 682691c8f730df13a0a3424a91fda0898fc2626e
-SHA1 (patch-ae) = a5869b106a704afde677a54b894e3848c9f929eb
-SHA1 (patch-af) = 8193e7504c5730813309b6ef9f172ef14dc0da9f
+SHA1 (amarok-2.4.0.tar.bz2) = d37ecda0fecdba88bb239f11c6d4ff885d7ac23f
+RMD160 (amarok-2.4.0.tar.bz2) = f32a664521b9827ef8e7d49100e39b69fa87dd29
+Size (amarok-2.4.0.tar.bz2) = 15219572 bytes
+SHA1 (patch-ab) = dc89394f02639c27bbcef2954aa199032c6a9ca1
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
deleted file mode 100644
index d52c1c9e18b..00000000000
--- a/audio/amarok/patches/patch-aa
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-aa,v 1.21 2010/10/29 09:28:13 wiz Exp $
-
-Three fixes from upstream:
-
-BPM bugfix for FLAC fils, amarok commit ce57e426.
-
-Re-add some tests for unprintable but also invalid chars. Apparently
-Qt's XML classes don't properly check for invalid chars when writing
-XML, even if you tel l them to.  Also switch to QXmlStreamWriter,
-as apparently going forward it is the more supported class.  BUG:
-251762, commmit 79d86829294ac54132c01153660e70e30c15c378 (I think).
-
-Fix for previous from
-http://gitweb.kde.org/amarok.git/blobdiff_plain/0b8577293698f88f2c6e5a1661ba570d0dd264b5..182f39c15575c3c1ce2b0425f9e3ec5997f3a9fd:/utilities/collectionscanner/CollectionScanner.cpp
-
---- utilities/collectionscanner/CollectionScanner.cpp.orig	2010-09-24 09:21:46.000000000 +0000
-+++ utilities/collectionscanner/CollectionScanner.cpp
-@@ -37,13 +37,13 @@
- #include <QByteArray>
- #include <QDBusReply>
- #include <QDir>
--#include <QDomDocument>
- #include <QFile>
- #include <QtDebug>
- #include <QTextCodec>
- #include <QTextStream>
- #include <QTimer>
- #include <QThread>
-+#include <QXmlStreamWriter>
- 
- //Taglib:
- #include <apetag.h>
-@@ -814,8 +814,10 @@ CollectionScanner::readTags( const QStri
- void
- CollectionScanner::writeElement( const QString &name, const AttributeHash &attributes )
- {
--    QDomDocument doc; // A dummy. We don't really use DOM, but SAX2
--    QDomElement element = doc.createElement( name );
-+    QString text;
-+    QXmlStreamWriter writer( &text );
-+
-+    writer.writeStartElement( name );
- 
-     QHashIterator<QString, QString> it( attributes );
-     while( it.hasNext() )
-@@ -829,7 +831,15 @@ CollectionScanner::writeElement( const Q
-         bool noCategory = false;
-         for( unsigned i = 0; i < len; i++ )
-         {
--            if( data[i].category() == QChar::NoCategory )
-+            if( data[i].category() == QChar::NoCategory ||
-+                data[i].category() == QChar::Other_Surrogate ||
-+                ( 
-+                    data[i].unicode() < 32 &&
-+                    data[i].unicode() != 9 &&
-+                    data[i].unicode() != 10 &&
-+                    data[i].unicode() != 13
-+                )
-+            )
-             {
-                 noCategory = true;
-                 break;
-@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const Q
- 
-         if( noCategory )
-             continue;
--
--        element.setAttribute( it.key(), it.value() );
-+        writer.writeAttribute( it.key(), it.value() );
-     }
- 
--    QString text;
--    QTextStream stream( &text, QIODevice::WriteOnly );
--    element.save( stream, 0 );
-+    writer.writeEndElement();
- 
--    std::cout << text.toUtf8().data() << std::endl;
-+    std::cout << text.toUtf8().data() << std::endl << std::endl;
- }
- 
- // taken verbatim from Qt's sources, since it's stupidly in the QtGui module
diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab
index 600722af197..57ed23ab698 100644
--- a/audio/amarok/patches/patch-ab
+++ b/audio/amarok/patches/patch-ab
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.7 2010/09/20 21:29:15 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2011/01/27 17:24:19 wiz Exp $
 
 Add rpath for embedded mySQL library.
 
---- src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt.orig	2010-03-10 23:12:15.000000000 +0000
-+++ src/core-impl/collections/sqlcollection/mysqlecollection/CMakeLists.txt
+--- src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt.orig	2010-03-10 23:12:15.000000000 +0000
++++ src/core-impl/collections/db/sql/mysqlecollection/CMakeLists.txt
 @@ -49,6 +49,7 @@ if(APPLE)
  	SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
  endif(APPLE)
diff --git a/audio/amarok/patches/patch-ac b/audio/amarok/patches/patch-ac
deleted file mode 100644
index 8f62bbf74f8..00000000000
--- a/audio/amarok/patches/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2010/10/02 10:08:31 wiz Exp $
-
-commit 7dbec1171386f182be77942ae43dc3684a96cfc4
-Author: Mark Kretschmann <kretschmann@kde.org>
-Date:   Sat Oct 2 09:06:11 2010 +0200
-
-    Better workaround for wrong applet size on startup.
-
-    This version also works in the case that Amarok was hidden to
-    tray before starting, and it does not produce a jerking motion
-    when starting in fullscreen mode.
-    Thanks to Felix Geyer <debfx-pkg@fobos.de> for the idea.
-
-    It might worth to include this patch in Amarok packages.
-
---- src/App.cpp.orig	2010-09-15 21:24:11.000000000 +0000
-+++ src/App.cpp
-@@ -787,18 +787,6 @@ App::continueInit()
-         aUrl.run();
-     }
-     s_delayedAmarokUrls.clear();
--
--    QTimer::singleShot( 1500, this, SLOT( resizeMainWindow() ) );
--}
--
--
--void App::resizeMainWindow() // SLOT
--{
--    // HACK
--    // This code works around a bug in KDE 4.5, which causes our Plasma applets to show
--    // with a wrong initial size. Remove when this bug is fixed in Plasma.
--    m_mainWindow->resize( m_mainWindow->width(), m_mainWindow->height() - 1 );
--    m_mainWindow->resize( m_mainWindow->width(), m_mainWindow->height() + 1 );
- }
- 
- 
diff --git a/audio/amarok/patches/patch-ad b/audio/amarok/patches/patch-ad
deleted file mode 100644
index e942d7f688b..00000000000
--- a/audio/amarok/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2010/10/02 10:08:31 wiz Exp $
-
-commit 7dbec1171386f182be77942ae43dc3684a96cfc4
-Author: Mark Kretschmann <kretschmann@kde.org>
-Date:   Sat Oct 2 09:06:11 2010 +0200
-
-    Better workaround for wrong applet size on startup.
-
-    This version also works in the case that Amarok was hidden to
-    tray before starting, and it does not produce a jerking motion
-    when starting in fullscreen mode.
-    Thanks to Felix Geyer <debfx-pkg@fobos.de> for the idea.
-
-    It might worth to include this patch in Amarok packages.
-
---- src/App.h.orig	2010-09-15 21:24:11.000000000 +0000
-+++ src/App.h
-@@ -83,7 +83,6 @@ class AMAROK_EXPORT App : public KUnique
- 
-     private slots:
-         void continueInit();
--        void resizeMainWindow();
- 
-     public slots:
-         void applySettings( bool firstTime = false );
diff --git a/audio/amarok/patches/patch-ae b/audio/amarok/patches/patch-ae
deleted file mode 100644
index 5d958328ae2..00000000000
--- a/audio/amarok/patches/patch-ae
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/10/02 10:08:31 wiz Exp $
-
-commit 7dbec1171386f182be77942ae43dc3684a96cfc4
-Author: Mark Kretschmann <kretschmann@kde.org>
-Date:   Sat Oct 2 09:06:11 2010 +0200
-
-    Better workaround for wrong applet size on startup.
-
-    This version also works in the case that Amarok was hidden to
-    tray before starting, and it does not produce a jerking motion
-    when starting in fullscreen mode.
-    Thanks to Felix Geyer <debfx-pkg@fobos.de> for the idea.
-
-    It might worth to include this patch in Amarok packages.
-
---- src/MainWindow.cpp.orig	2010-09-15 21:24:11.000000000 +0000
-+++ src/MainWindow.cpp
-@@ -506,6 +506,13 @@ MainWindow::showEvent(QShowEvent* e)
-     if (!m_layoutEverRestored)
-         restoreLayout();
- 
-+    static bool windowEverShown = false;
-+    if ( !windowEverShown )
-+    {
-+        windowEverShown = true;
-+        QTimer::singleShot( 250, this, SLOT( resizeWindowHack() ) );
-+    }
-+
-     QWidget::showEvent(e);
- }
- 
-@@ -1704,4 +1711,14 @@ MainWindow::isWaitingForCd() const
-     return m_waitingForCd;
- }
- 
-+void
-+MainWindow::resizeWindowHack()
-+{
-+    // HACK
-+    // This code works around a bug in KDE 4.5, which causes our Plasma applets to show
-+    // with a wrong initial size. Remove when this bug is fixed in Plasma.
-+    resize( width(), height() - 1 );
-+    resize( width(), height() + 1 );
-+}
-+
- #include "MainWindow.moc"
diff --git a/audio/amarok/patches/patch-af b/audio/amarok/patches/patch-af
deleted file mode 100644
index 2f58ff7a957..00000000000
--- a/audio/amarok/patches/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-af,v 1.1 2010/10/02 10:08:31 wiz Exp $
-
-commit 7dbec1171386f182be77942ae43dc3684a96cfc4
-Author: Mark Kretschmann <kretschmann@kde.org>
-Date:   Sat Oct 2 09:06:11 2010 +0200
-
-    Better workaround for wrong applet size on startup.
-
-    This version also works in the case that Amarok was hidden to
-    tray before starting, and it does not produce a jerking motion
-    when starting in fullscreen mode.
-    Thanks to Felix Geyer <debfx-pkg@fobos.de> for the idea.
-
-    It might worth to include this patch in Amarok packages.
-
---- src/MainWindow.h.orig	2010-09-15 21:24:11.000000000 +0000
-+++ src/MainWindow.h
-@@ -148,6 +148,7 @@ class AMAROK_EXPORT MainWindow : public 
-         void slotAddStream();
-         void slotJumpTo();
-         void showScriptSelector();
-+        void resizeWindowHack();
- #ifdef DEBUG_BUILD_TYPE
-         void showNetworkRequestViewer();
- #endif // DEBUG_BUILD_TYPE