Version bump, remove old ebuilds and patches

(Portage version: 2.2.0_alpha14/cvs/Linux x86_64)

5 files changed, 26 insertions, 614 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index d7fd0afd15b0..ea2b7406f502 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/amarok
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.396 2010/11/21 22:35:24 tomka Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.397 2011/01/12 20:18:36 tampakrap Exp $
+
+*amarok-2.4.0 (12 Jan 2011)
+
+  12 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  -amarok-2.3.1-r2.ebuild, -amarok-2.3.1.90.ebuild,
+  -files/amarok-2.3.1-fix-trayicon.patch, +amarok-2.4.0.ebuild,
+  -files/amarok-fix-accessibility-dep.patch:
+  Version bump, remove old ebuilds and patches
 
   21 Nov 2010; Thomas Kahle <tomka@gentoo.org> amarok-2.3.2-r1.ebuild:
   x86 stable per bug 346233
diff --git a/media-sound/amarok/amarok-2.3.1-r2.ebuild b/media-sound/amarok/amarok-2.3.1-r2.ebuild
deleted file mode 100644
index 63461a5235b0..000000000000
--- a/media-sound/amarok/amarok-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.1-r2.ebuild,v 1.5 2010/08/24 01:44:26 jmbsvicetto Exp $
-
-EAPI="2"
-
-# Translations are only in the tarballs, not the git repo
-if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="af bg ca ca@valencia cs da de el en_GB es et fr it ja lt lv nb nds pa pl
-	pt pt_BR ru sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-else
-	EGIT_REPO_URI="git://git.kde.org/${PN}/${PN}.git"
-	GIT_ECLASS="git"
-fi
-
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base ${GIT_ECLASS}
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-SLOT="4"
-IUSE="cdda daap debug embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
-
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	player? (
-		app-crypt/qca:2
-		>=app-misc/strigi-0.5.7[dbus,qt4]
-		|| ( >=dev-db/mysql-5.0.76 =virtual/mysql-5.1 )
-		>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
-		sys-libs/zlib
-		x11-libs/qt-script
-		>=x11-libs/qtscriptgenerator-0.1.0
-		cdda? (
-			>=kde-base/libkcddb-${KDE_MINIMAL}
-			>=kde-base/libkcompactdisc-${KDE_MINIMAL}
-			>=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
-		)
-		embedded? ( <dev-db/mysql-5.1[embedded,-minimal] )
-		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-		lastfm? ( >=media-libs/liblastfm-0.3.0 )
-		mp3tunes? (
-			dev-libs/glib:2
-			dev-libs/libxml2
-			dev-libs/openssl
-			net-libs/loudmouth
-			net-misc/curl
-			x11-libs/qt-core[glib]
-		)
-		mtp? ( >=media-libs/libmtp-0.3.0 )
-		opengl? ( virtual/opengl )
-	)
-	utils? (
-		x11-libs/qt-core
-		x11-libs/qt-dbus
-	)
-	!player? ( !utils? ( media-sound/amarok[player] ) )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	dev-util/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} )
-"
-
-# The fix trayicon patch was assembled from the 4 patches committed by Kevin Funk to fix
-# upstream bug at https://bugs.kde.org/show_bug.cgi?id=232578#c13 and available from
-# http://krf.kollide.net/files/work/amarok/
-# They correspond to the following 4 git commits:
-# http://gitweb.kde.org/amarok/amarok.git/commit/e959e75a8f028eb36406d65118885c32e3eff3c8
-# http://gitweb.kde.org/amarok/amarok.git/commit/26104cd35fd50222c354f3afc9fce6bba093c05f
-# http://gitweb.kde.org/amarok/amarok.git/commit/4995f14cefbbe78e9dd3c42af00188e6c82e6f94
-# http://gitweb.kde.org/amarok/amarok.git/commit/74ea4c1f9e69952ac274be44ab37ed073e61c1e6
-PATCHES=( "${FILESDIR}/${PN}-fix-accessibility-dep.patch" "${FILESDIR}/${P}-fix-trayicon.patch")
-
-src_prepare() {
-	if ! use player; then
-		# Disable po processing
-		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-		sed -e "s:macro_optional_add_subdirectory( po )::" \
-			-i "${S}/CMakeLists.txt" \
-			|| die "Removing include of MacroOptionalAddSubdirectory failed."
-	fi
-
-	kde4-base_src_prepare
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	if use player; then
-		mycmakeargs=(
-			-DWITH_PLAYER=ON
-			-DWITH_Libgcrypt=OFF
-			$(cmake-utils_use embedded WITH_MYSQL_EMBEDDED)
-			$(cmake-utils_use_with ipod)
-			$(cmake-utils_use_with ipod Gdk)
-			$(cmake-utils_use_with lastfm LibLastFm)
-			$(cmake-utils_use_with mtp)
-			$(cmake-utils_use_with mp3tunes MP3Tunes)
-		)
-	else
-		mycmakeargs=(
-			-DWITH_PLAYER=OFF
-		)
-	fi
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-		# $(cmake-utils_use_with semantic-desktop Nepomuk)
-		# $(cmake-utils_use_with semantic-desktop Soprano)
-
-	kde4-base_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if use player; then
-
-		if use daap; then
-			echo
-			elog "You have installed amarok with daap support."
-			elog "You may be interested in installing www-servers/mongrel as well."
-			echo
-		fi
-
-		if ! use embedded; then
-			echo
-			elog "You've disabled the amarok support for embedded mysql DBs."
-			elog "You'll have to configure amarok to use an external db server."
-			echo
-			elog "Please read http://amaroklive.com/wiki/MySQL_Server for details on how"
-			elog "to configure the external db and migrate your data from the embedded database."
-			echo
-
-			if has_version "dev-db/mysql[minimal]"; then
-				elog "You built mysql with the minimal use flag, so it doesn't include the server."
-				elog "You won't be able to use the local mysql installation to store your amarok collection."
-				echo
-			fi
-		fi
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.3.1.90.ebuild b/media-sound/amarok/amarok-2.4.0.ebuild
index 1718e60e2a3b..87903e202f01 100644
--- a/media-sound/amarok/amarok-2.3.1.90.ebuild
+++ b/media-sound/amarok/amarok-2.4.0.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.1.90.ebuild,v 1.3 2010/09/19 13:03:20 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.0.ebuild,v 1.1 2011/01/12 20:18:36 tampakrap Exp $
 
 EAPI="2"
 
 # Translations are only in the tarballs, not the git repo
 if [[ ${PV} != *9999* ]]; then
-	KDE_LINGUAS="af bg ca ca@valencia cs da de el en_GB es et fr it ja lt lv nb nds pa pl
-	pt pt_BR ru sk sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr uk zh_CN zh_TW"
+	KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl
+	pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
 	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 else
-	EGIT_REPO_URI="git://git.kde.org/${PN}/${PN}.git"
+	EGIT_REPO_URI="git://anongit.kde.org/${PN}"
 	GIT_ECLASS="git"
+	KEYWORDS=""
 fi
 
 KDE_REQUIRED="never"
@@ -21,9 +23,8 @@ DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 SLOT="4"
-IUSE="cdda daap debug embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
+IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
 
 # Tests require gmock - http://code.google.com/p/gmock/
 # It's not in the tree yet
@@ -36,9 +37,9 @@ COMMONDEPEND="
 	player? (
 		app-crypt/qca:2
 		>=app-misc/strigi-0.5.7[dbus,qt4]
-		|| ( >=dev-db/mysql-5.0.76 =virtual/mysql-5.1 )
 		>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
 		sys-libs/zlib
+		>=virtual/mysql-5.1
 		x11-libs/qt-script
 		>=x11-libs/qtscriptgenerator-0.1.0
 		cdda? (
@@ -46,7 +47,12 @@ COMMONDEPEND="
 			>=kde-base/libkcompactdisc-${KDE_MINIMAL}
 			>=kde-base/kdemultimedia-kioslaves-${KDE_MINIMAL}
 		)
-		embedded? ( <dev-db/mysql-5.1[embedded,-minimal] )
+		embedded? (
+			|| (
+				>=dev-db/mysql-5.1.50-r3[embedded]
+				>=dev-db/mariadb-5.1.50[embedded]
+			)
+		)
 		ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
 		lastfm? ( >=media-libs/liblastfm-0.3.0 )
 		mp3tunes? (
@@ -57,7 +63,7 @@ COMMONDEPEND="
 			net-misc/curl
 			x11-libs/qt-core[glib]
 		)
-		mtp? ( >=media-libs/libmtp-0.3.0 )
+		mtp? ( >=media-libs/libmtp-1.0.0 )
 		opengl? ( virtual/opengl )
 	)
 	utils? (
diff --git a/media-sound/amarok/files/amarok-2.3.1-fix-trayicon.patch b/media-sound/amarok/files/amarok-2.3.1-fix-trayicon.patch
deleted file mode 100644
index db423c9ec82f..000000000000
--- a/media-sound/amarok/files/amarok-2.3.1-fix-trayicon.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-diff -urN amarok-2.3.1/src/TrayIcon.cpp amarok-2.3.1-new//src/TrayIcon.cpp
---- amarok-2.3.1/src/TrayIcon.cpp	2010-05-27 18:37:20.000000000 +0000
-+++ amarok-2.3.1-new//src/TrayIcon.cpp	2010-07-11 15:21:36.000000000 +0000
-@@ -26,33 +26,24 @@
- #include "EngineController.h"
- #include "amarokconfig.h"
- #include "GlobalCurrentTrackActions.h"
--#include "core/meta/support/MetaConstants.h"
- #include "core/capabilities/CurrentTrackActionsCapability.h"
- #include "playlist/PlaylistActions.h"
--#include "playlist/PlaylistModelStack.h"
- #include "SvgHandler.h"
- #include <KAboutData>
- #include <KAction>
- #include <KCmdLineArgs>
--#include <KIcon>
--#include <KIconEffect>
- #include <KLocale>
- #include <KMenu>
- #include <KStandardDirs>
- 
- #include <QAction>
--#include <QEvent>
- #include <QFontMetrics>
--#include <QMouseEvent>
--#include <QPainter>
- #include <QPixmap>
--#include <QTime>
- #include <QToolTip>
- 
- Amarok::TrayIcon::TrayIcon( QObject *parent )
-         : KStatusNotifierItem( parent )
-         , Engine::EngineObserver( The::engineController() )
--        , m_trackLength( 0 )
-         , m_separator( 0 )
- {
-     DEBUG_BLOCK
-@@ -64,13 +55,13 @@
- 
-     PERF_LOG( "Before adding actions" );
- 
--    #ifdef Q_WS_MAC
-+#ifdef Q_WS_MAC
-     // Add these functions to the dock icon menu in OS X
-     extern void qt_mac_set_dock_menu(QMenu *);
-     qt_mac_set_dock_menu( contextMenu() );
-     contextMenu()->addAction( ac->action( "playlist_playmedia" ) );
-     contextMenu()->addSeparator();
--    #endif
-+#endif
- 
-     contextMenu()->addAction( ac->action( "prev"       ) );
-     contextMenu()->addAction( ac->action( "play_pause" ) );
-@@ -79,105 +70,87 @@
-     contextMenu()->setObjectName( "TrayIconContextMenu" );
- 
-     PERF_LOG( "Adding system tray icon" );
--    paintIcon();
- 
--    setupToolTip();
-+    setIconByName( "amarok" );
-+
-+    setupToolTip( true );
- 
-     connect( this, SIGNAL( scrollRequested( int, Qt::Orientation ) ), SLOT( slotScrollRequested(int, Qt::Orientation) ) );
-     connect( this, SIGNAL( secondaryActivateRequested( const QPoint & ) ), SLOT( slotActivated() ) );
- }
- 
- void
--Amarok::TrayIcon::setupToolTip()
-+Amarok::TrayIcon::setupToolTip( bool updateIcon )
- {
-     if( m_track )
-     {
-         setToolTipTitle( The::engineController()->prettyNowPlaying() );
- 
--        QStringList tooltip;
--        // TODO: Use Observer to get notified about changed album art
--        if( m_track->album() )
-+        // check if we really need to update the icon (performance tweak)
-+        if( updateIcon )
-         {
--            const QString uid = m_track->uidUrl();
--            if ( uid != m_toolTipIconUid ) {
--                const QPixmap image = The::svgHandler()->imageWithBorder( m_track->album(), KIconLoader::SizeLarge, 5 );
--                if ( image.isNull() )
--                {
--                    setToolTipIconByName( "amarok" );
--                    m_toolTipIconUid.clear();
--                }
--                else
--                {
--                    setToolTipIconByPixmap( image );
--                    m_toolTipIconUid = uid;
--                }
-+            if( m_track->album() && m_track->album()->hasImage() )
-+            {
-+                QPixmap image = The::svgHandler()->imageWithBorder( m_track->album(), KIconLoader::SizeLarge, 5 );
-+                setToolTipIconByPixmap( image );
-+            }
-+            else
-+            {
-+                setToolTipIconByName( "amarok" );
-             }
--        }
--        else
--        {
--            setToolTipIconByName( "amarok" );
--            m_toolTipIconUid.clear();
-         }
- 
--        QStringList left, right;
-+        QStringList tooltip;
- 
--        // TODO: Replace block by some other useful information
-         QString volume;
-         if ( The::engineController()->isMuted() )
-+        {
-             volume = i18n( "Muted" );
-+        }
-         else
-+        {
-             volume = QString( "%1%" ).arg( The::engineController()->volume() );
--        right << QString("<i>%1</i>").arg( volume );
--        left << QString( "<i>%1</i>" ).arg( i18n( "Volume" ) );
-+        }
-+        tooltip << QString("<i>%1: %2</i>").arg( i18n( "Volume" ) ).arg( volume );
- 
-         const float score = m_track->score();
-         if( score > 0.f )
-         {
--            right << QString::number( score, 'f', 2 );  // 2 digits after decimal point
--            left << i18n( "Score" );
-+            tooltip << QString( "%1: %2" ).arg( i18n( "Score" ) ).arg( QString::number( score, 'f', 2 ) );
-         }
- 
-         const int rating = m_track->rating();
-         if( rating > 0 )
-         {
--            QString s;
-+            QString stars;
-             for( int i = 0; i < rating / 2; ++i )
--                s += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
-+                stars += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
-                         .arg( KStandardDirs::locate( "data", "amarok/images/star.png" ) )
-                         .arg( QFontMetrics( QToolTip::font() ).height() )
-                         .arg( QFontMetrics( QToolTip::font() ).height() );
-             if( rating % 2 )
--                s += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
-+                stars += QString( "<img src=\"%1\" height=\"%2\" width=\"%3\">" )
-                         .arg( KStandardDirs::locate( "data", "amarok/images/smallstar.png" ) )
-                         .arg( QFontMetrics( QToolTip::font() ).height() )
-                         .arg( QFontMetrics( QToolTip::font() ).height() );
--            right << s;
--            left << i18n( "Rating" );
-+
-+            tooltip << QString( "%1: %2" ).arg( i18n( "Rating" ) ).arg( stars );
-         }
- 
-         const int count = m_track->playCount();
-         if( count > 0 )
-         {
--            right << QString::number( count );
--            left << i18n( "Play Count" );
-+            tooltip << QString( "%1: %2" ).arg( i18n( "Play Count" ) ).arg( QString::number( count ) );
-         }
- 
-         const uint lastPlayed = m_track->lastPlayed();
--        right << Amarok::verboseTimeSince( lastPlayed );
--        left << i18n( "Last Played" );
--
--        // NOTE: It seems to be necessary to <center> each element indivdually
--        const QString row = "- %1: %2";
--        for( int x = 0; x < left.count(); ++x )
--            if ( !right[x].isEmpty() )
--                tooltip << row.arg( left[x] ).arg( right[x] );
-+        tooltip << QString( "%1: %2" ).arg( i18n( "Last played" ) ).arg( Amarok::verboseTimeSince( lastPlayed ) );
- 
-         setToolTipSubTitle( tooltip.join("<br>") );
-     }
-     else
-     {
-         setToolTipIconByName( "amarok" );
--        m_toolTipIconUid.clear();
-         setToolTipTitle( KCmdLineArgs::aboutData()->programName() );
-         setToolTipSubTitle( The::engineController()->prettyNowPlaying() );
-     }
-@@ -199,20 +172,26 @@
-     switch( state )
-     {
-         case Phonon::PlayingState:
--            unsubscribeFrom( m_track );
-+            if ( m_track )
-+            {
-+                unsubscribeFrom( m_track );
-+                unsubscribeFrom( m_track->album() );
-+            }
-             m_track = track;
--            m_trackLength = m_track ? m_track->length() : 0;
--            subscribeTo( track );
-+            if ( track )
-+            {
-+                subscribeTo( track );
-+                subscribeTo( track->album() );
-+            }
- 
--            paintIcon( 0 );
-+            setOverlayIconByName( "media-playback-start" );
-             setupMenu();
-             break;
- 
-         case Phonon::StoppedState:
-             m_track = 0;
--            m_trackLength = 0;
- 
--            paintIcon();
-+            setOverlayIconByName( QString() );
-             setupMenu(); // remove custom track actions on stop
-             break;
- 
-@@ -223,21 +202,19 @@
-         case Phonon::LoadingState:
-         case Phonon::ErrorState:
-         case Phonon::BufferingState:
-+            setOverlayIconByName( QString() );
-             break;
-     }
- 
--    setupToolTip();
-+    setupToolTip( true );
- }
- 
- void
- Amarok::TrayIcon::engineNewTrackPlaying()
- {
-     m_track = The::engineController()->currentTrack();
--    m_trackLength = m_track ? m_track->length() : 0;
--
--    paintIcon( 0 );
- 
--    setupToolTip();
-+    setupToolTip( true );
-     setupMenu();
- }
- 
-@@ -246,17 +223,17 @@
- {
-     Q_UNUSED( track )
- 
--    setupToolTip();
-+    setupToolTip( false );
-     setupMenu();
- }
- 
- void
--Amarok::TrayIcon::engineTrackPositionChanged( qint64 position, bool userSeek )
-+Amarok::TrayIcon::metadataChanged( Meta::AlbumPtr album )
- {
--    Q_UNUSED( userSeek );
-+    Q_UNUSED( album )
- 
--    if( m_trackLength )
--        paintIcon( position );
-+    setupToolTip( true );
-+    setupMenu();
- }
- 
- void
-@@ -264,7 +241,7 @@
- {
-     Q_UNUSED( percent );
- 
--    setupToolTip();
-+    setupToolTip( false );
- }
- 
- void
-@@ -272,72 +249,7 @@
- {
-     Q_UNUSED( mute );
- 
--    setupToolTip();
--}
--
--void
--Amarok::TrayIcon::paletteChange( const QPalette & op )
--{
--    Q_UNUSED( op );
--
--    paintIcon();
--}
--
--void
--Amarok::TrayIcon::paintIcon( qint64 trackPosition )
--{
--    static qint64 oldMergePos = -1;
--
--    // start up
--    // TODO: Move these two blocks to ctor (warning: might get some regressions)
--    if( m_baseIcon.isNull() )
--    {
--        m_baseIcon = KIconLoader::global()->loadIcon( "amarok", KIconLoader::Panel );
--        setIconByPixmap( m_baseIcon ); // show icon
--        setOverlayIconByName( QString() );
--        return; // HACK: return because m_baseIcon is still null after first startup (why?)
--    }
--
--    if( m_grayedIcon.isNull() )
--    {
--        m_grayedIcon = m_baseIcon; // copies object
--        KIconEffect::semiTransparent( m_grayedIcon );
--    }
--
--    // trackPosition < 0 means reset
--    if( trackPosition < 0 )
--    {
--        oldMergePos = -1;
--        setIconByPixmap( m_baseIcon );
--        setOverlayIconByName( QString() );
--        return;
--    }
--
--    // check if we are playing a stream
--    if( !m_trackLength )
--    {
--        m_icon = m_baseIcon;
--        setIconByPixmap( m_icon );
--        setOverlayIconByName( "media-playback-start" );
--        return;
--    }
--
--    const qint64 mergePos = ( float( trackPosition ) / m_trackLength ) * m_icon.height();
--
--    // return if pixmap would stay the same
--    if( oldMergePos == mergePos )
--        return;
--
--    // draw m_baseIcon on top of the gray version
--    m_icon = m_grayedIcon; // copies object
--    QPainter p( &m_icon );
--    p.drawPixmap( 0, 0, m_baseIcon, 0, 0, 0, m_icon.height() - mergePos );
--    p.end();
--
--    oldMergePos = mergePos;
--
--    setIconByPixmap( m_icon );
--    setOverlayIconByName( "media-playback-start" );
-+    setupToolTip( false );
- }
- 
- void
-diff -urN amarok-2.3.1/src/TrayIcon.h amarok-2.3.1-new//src/TrayIcon.h
---- amarok-2.3.1/src/TrayIcon.h	2010-05-27 18:37:20.000000000 +0000
-+++ amarok-2.3.1-new//src/TrayIcon.h	2010-07-11 15:21:36.000000000 +0000
-@@ -1,7 +1,7 @@
- /****************************************************************************************
-  * Copyright (c) 2003 Stanislav Karchebny <berkus@users.sf.net>                         *
-- * Copyright (c) 2009 Kevin Funk <krf@electrostorm.net>                                 *
-  * Copyright (c) 2009 Mark Kretschmann <kretschmann@kde.org>                            *
-+ * Copyright (c) 2009,2010 Kevin Funk <krf@electrostorm.net>                            *
-  *                                                                                      *
-  * This program is free software; you can redistribute it and/or modify it under        *
-  * the terms of the GNU General Public License as published by the Free Software        *
-@@ -19,18 +19,15 @@
- #ifndef AMAROK_TRAYICON_H
- #define AMAROK_TRAYICON_H
- 
--#include "core/engine/EngineObserver.h" //baseclass
-+#include "core/engine/EngineObserver.h" // baseclass
- #include "core/meta/Meta.h"
- #include "core/support/SmartPointerList.h"
- 
--#include <KStatusNotifierItem> //baseclass
-+#include <KStatusNotifierItem> // baseclass
- 
- #include <QAction>
- #include <QPointer>
- 
--class QEvent;
--class App;
--
- 
- namespace Amarok {
- 
-@@ -40,24 +37,20 @@
- 
- public:
-     TrayIcon( QObject *parent );
--    friend class ::App;
--    
-+
-     void setVisible( bool visible );
- 
- protected:
-     // reimplemented from engineobserver
-     virtual void engineStateChanged( Phonon::State state, Phonon::State oldState = Phonon::StoppedState );
-     virtual void engineNewTrackPlaying();
--    virtual void engineTrackPositionChanged( qint64 position, bool /*userSeek*/ );
-     virtual void engineVolumeChanged( int percent );
-     virtual void engineMuteStateChanged( bool mute );
- 
--    //Reimplemented from Meta::Observer
-+    // reimplemented from Meta::Observer
-     using Observer::metadataChanged;
-     virtual void metadataChanged( Meta::TrackPtr track );
--
--    // get notified of 'highlight' color change
--    virtual void paletteChange( const QPalette & oldPalette );
-+    virtual void metadataChanged( Meta::AlbumPtr album );
- 
- private slots:
-     void slotActivated();
-@@ -65,15 +58,10 @@
- 
- private:
-     void setupMenu();
--    void setupToolTip();
--
--    void paintIcon( qint64 trackPosition = -1 );
-+    void setupToolTip( bool updateIcon );
- 
-     Meta::TrackPtr m_track;
--    qint64 m_trackLength;
--    QString m_toolTipIconUid;
- 
--    QPixmap m_baseIcon, m_grayedIcon, m_icon;
-     SmartPointerList<QAction> m_extraActions;
-     QPointer<QAction> m_separator;
- };
diff --git a/media-sound/amarok/files/amarok-fix-accessibility-dep.patch b/media-sound/amarok/files/amarok-fix-accessibility-dep.patch
deleted file mode 100644
index d86abe920497..000000000000
--- a/media-sound/amarok/files/amarok-fix-accessibility-dep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN amarok-2.3.1/src/core-impl/collections/audiocd/FormatSelectionDialog.ui amarok-2.3.1-new/src/core-impl/collections/audiocd/FormatSelectionDialog.ui
---- amarok-2.3.1/src/core-impl/collections/audiocd/FormatSelectionDialog.ui	2010-05-27 18:37:21.000000000 +0000
-+++ amarok-2.3.1-new/src/core-impl/collections/audiocd/FormatSelectionDialog.ui	2010-06-11 18:23:00.157305026 +0000
-@@ -13,9 +13,6 @@
-   <property name="windowTitle">
-    <string>Amarok</string>
-   </property>
--  <property name="accessibleName">
--   <string/>
--  </property>
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0" colspan="2">
-     <widget class="QGroupBox" name="groupBox">