Version bump, remove old, bug 275467

(Portage version: 2.2_rc33/cvs/Linux x86_64)

7 files changed, 96 insertions, 544 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 44f5b16989a4..7a7eece915fc 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.331 2009/06/13 11:01:17 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.332 2009/06/26 11:13:41 tampakrap Exp $
+
+*amarok-2.1.1 (26 Jun 2009)
+
+  26 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -files/2.0.1.1-ipod.patch, -amarok-2.0.2-r2.ebuild,
+  -amarok-2.0.2-r3.ebuild, -files/amarok-2.0.2-lastfm-authentication.patch,
+  +amarok-2.1.1.ebuild, -files/amarok-ipod.patch:
+  Version bump, remove old, bug 275467
 
   13 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org> amarok-2.1.ebuild:
   Enable KDE_LINGUAS.
diff --git a/media-sound/amarok/amarok-2.0.2-r2.ebuild b/media-sound/amarok/amarok-2.0.2-r2.ebuild
deleted file mode 100644
index ba18628564b9..000000000000
--- a/media-sound/amarok/amarok-2.0.2-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r2.ebuild,v 1.3 2009/06/04 19:48:24 tampakrap Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca cs csb da de el eo es et eu fi fr ga gl he is it ja km
-	ko ku lt lv nb nds ne nl nn oc pa pl pt pt_BR ro ru se si sk sl sv th tr uk zh_CN zh_TW"
-OPENGL_REQUIRED="optional"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-# Blocking amarok:0 until the KDE3 eclasses are updated
-# to move misc apps to /usr/kde/3.5
-DEPEND="
-	>=app-misc/strigi-0.5.7
-	|| (
-		>=dev-db/mysql-5.0.76-r1[embedded,-minimal]
-		>=dev-db/mysql-community-5.0.77-r1[embedded,-minimal]
-	)
-	>=media-libs/taglib-1.5
-	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
-	>=kde-base/phonon-kde-${KDE_MINIMAL}
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
-	x11-libs/qtscriptgenerator
-	cdaudio? (
-		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
-		>=kde-base/libkcddb-${KDE_MINIMAL}
-	)
-	ifp? ( media-libs/libifp )
-	ipod? ( >=media-libs/libgpod-0.7.0 )
-	mp3tunes? (
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-	)
-	mp4? ( media-libs/libmp4v2 )
-	mtp? ( >=media-libs/libmtp-0.3.0 )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-"
-
-RDEPEND="${DEPEND}
-	app-arch/unzip
-	daap? ( www-servers/mongrel )"
-
-PATCHES=( "${FILESDIR}/${PN}-ipod.patch" )
-
-src_configure() {
-	append-ldflags -L${KDEDIR}/$(get_libdir) -Wl,--as-needed
-
-	if ! use mp3tunes; then
-		sed -e'/mp3tunes/ s:^:#DONOTWANT :' \
-			-i "${S}"/src/services/CMakeLists.txt \
-			|| die "Deactivating mp3tunes failed."
-	fi
-
-	# Remove superfluous QT_WEBKIT
-	sed -e 's/ -DQT_WEBKIT//g' \
-		-i "${S}"/src/scriptengine/generator/generator/CMakeLists.txt \
-		|| die "Removing unnecessary -DQT_WEBKIT failed."
-	# Remove qtscript-generator
-	sed -e 's:add_subdirectory( src/scriptengine/generator )::g' \
-		-i "${S}"/CMakeLists.txt \
-		|| die "Removing qtscriptgenerator failed."
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with cdaudio KdeMultimedia)
-		$(cmake-utils_use_with ipod Ipod)
-		$(cmake-utils_use_with ifp Ifp)
-		$(cmake-utils_use_with mp4 Mp4v2)
-		$(cmake-utils_use_with mtp Mtp)
-		$(cmake-utils_use_with njb Njb)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)"
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/amarok/amarok-2.0.2-r3.ebuild b/media-sound/amarok/amarok-2.0.2-r3.ebuild
deleted file mode 100644
index b8ee376b30d7..000000000000
--- a/media-sound/amarok/amarok-2.0.2-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r3.ebuild,v 1.3 2009/06/04 19:48:24 tampakrap Exp $
-
-EAPI="2"
-
-KDE_LINGUAS="ar be bg ca cs csb da de el eo es et eu fi fr ga gl he is it ja km
-	ko ku lt lv nb nds ne nl nn oc pa pl pt pt_BR ro ru se si sk sl sv th tr uk zh_CN zh_TW"
-OPENGL_REQUIRED="optional"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="cdaudio daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-
-# Blocking amarok:0 until the KDE3 eclasses are updated
-# to move misc apps to /usr/kde/3.5
-DEPEND="
-	!media-sound/amarok-utils
-	>=app-misc/strigi-0.5.7
-	|| (
-		>=dev-db/mysql-5.0.76-r1[embedded,-minimal]
-		>=dev-db/mysql-community-5.0.77-r1[embedded,-minimal]
-	)
-	>=media-libs/taglib-1.5
-	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
-	>=kde-base/phonon-kde-${KDE_MINIMAL}
-	>=kde-base/plasma-workspace-${KDE_MINIMAL}
-	x11-libs/qtscriptgenerator
-	cdaudio? (
-		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
-		>=kde-base/libkcddb-${KDE_MINIMAL}
-	)
-	ifp? ( media-libs/libifp )
-	ipod? ( >=media-libs/libgpod-0.7.0 )
-	mp3tunes? (
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-	)
-	mp4? ( media-libs/libmp4v2 )
-	mtp? ( >=media-libs/libmtp-0.3.0 )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-"
-
-RDEPEND="${DEPEND}
-	app-arch/unzip
-	daap? ( www-servers/mongrel )"
-
-# lastfm-authentication-patch was taken from upstream bug 188678.
-# commit http://websvn.kde.org/?view=rev&revision=949421
-PATCHES=( "${FILESDIR}/${PN}-ipod.patch" "${FILESDIR}/${P}-lastfm-authentication.patch" )
-
-src_configure() {
-	append-ldflags -L${KDEDIR}/$(get_libdir) -Wl,--as-needed
-
-	if ! use mp3tunes; then
-		sed -e'/mp3tunes/ s:^:#DONOTWANT :' \
-			-i "${S}"/src/services/CMakeLists.txt \
-			|| die "Deactivating mp3tunes failed."
-	fi
-
-	# Remove superfluous QT_WEBKIT
-	sed -e 's/ -DQT_WEBKIT//g' \
-		-i "${S}"/src/scriptengine/generator/generator/CMakeLists.txt \
-		|| die "Removing unnecessary -DQT_WEBKIT failed."
-	# Remove qtscript-generator
-	sed -e 's:add_subdirectory( src/scriptengine/generator )::g' \
-		-i "${S}"/CMakeLists.txt \
-		|| die "Removing qtscriptgenerator failed."
-
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with cdaudio KdeMultimedia)
-		$(cmake-utils_use_with ipod Ipod)
-		$(cmake-utils_use_with ifp Ifp)
-		$(cmake-utils_use_with mp4 Mp4v2)
-		$(cmake-utils_use_with mtp Mtp)
-		$(cmake-utils_use_with njb Njb)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)"
-
-	kde4-base_src_configure
-}
diff --git a/media-sound/amarok/amarok-2.1.1.ebuild b/media-sound/amarok/amarok-2.1.1.ebuild
new file mode 100644
index 000000000000..406e3d4eaaab
--- /dev/null
+++ b/media-sound/amarok/amarok-2.1.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.1.1.ebuild,v 1.1 2009/06/26 11:13:41 tampakrap Exp $
+
+EAPI="2"
+
+KDE_LINGUAS="bg ca cs da de el en_GB es et eu fr gl he is it ja km ku lt lv nb
+nds nl nn pa pl pt pt_BR ro ru sl sv th tr uk wa zh_CN zh_TW"
+OPENGL_REQUIRED="optional"
+KMNAME="extragear/multimedia"
+inherit kde4-base
+
+DESCRIPTION="Advanced audio player based on KDE framework."
+HOMEPAGE="http://amarok.kde.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="cdaudio daap debug ipod mp3tunes mtp +semantic-desktop"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+DEPEND="
+	>=app-misc/strigi-0.5.7
+	|| (
+		>=dev-db/mysql-5.0.76-r1[embedded,-minimal]
+		>=dev-db/mysql-community-5.0.77-r1[embedded,-minimal]
+	)
+	>=media-libs/taglib-1.5
+	>=media-libs/taglib-extras-0.1[kde]
+	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
+	sys-libs/zlib
+	>=x11-libs/qtscriptgenerator-0.1.0
+	cdaudio? (
+		>=kde-base/libkcddb-${KDE_MINIMAL}
+		>=kde-base/libkcompactdisc-${KDE_MINIMAL}
+	)
+	ipod? (
+		>=media-libs/libgpod-0.7.0[gtk]
+	)
+	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 )
+"
+RDEPEND="${DEPEND}
+	>=kde-base/phonon-kde-${KDE_MINIMAL}
+	>=media-sound/amarok-utils-${PV}
+	semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
+"
+
+PATCHES=( "${FILESDIR}/disable_bindings_test.patch" )
+
+src_configure() {
+	# Workaround for problems related to libmysqld.so and collection plugin not
+	# being found on some architectures when --as-needed is not used.
+	append-ldflags -Wl,--as-needed
+
+	mycmakeargs="${mycmakeargs}
+		-DWITH_PLAYER=ON
+		-DWITH_UTILITIES=OFF
+		-DWITH_Libgcrypt=OFF
+		$(cmake-utils_use_with ipod Ipod)
+		$(cmake-utils_use_with ipod Gdk)
+		$(cmake-utils_use_with mtp Mtp)
+		$(cmake-utils_use_with mp3tunes MP3TUNES)"
+#		$(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 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
+}
diff --git a/media-sound/amarok/files/2.0.1.1-ipod.patch b/media-sound/amarok/files/2.0.1.1-ipod.patch
deleted file mode 100644
index 2e4300ed514f..000000000000
--- a/media-sound/amarok/files/2.0.1.1-ipod.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -urN amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake amarok-2.0.1.1/cmake/modules/FindIpod.cmake
---- amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake	2009-01-06 13:48:28.000000000 +0100
-+++ amarok-2.0.1.1/cmake/modules/FindIpod.cmake	2009-02-10 18:18:23.000000000 +0100
-@@ -2,45 +2,35 @@
- # Once done this will define
- #
- #  IPOD_FOUND - system has libgpod
--#  IPOD_INCLUDE_DIR - the libgpod include directory
-+#  IPOD_INCLUDE_DIRS - the libgpod include directory
- #  IPOD_LIBRARIES - Link these to use libgpod
--#  IPOD_DEFINITIONS - Compiler switches required for using libgpod
-+#  IPOD_CFLAGS - Compiler switches required for using libgpod
-+#  IPOD_VERSION - Version number of libgpod
- #
- 
--if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
- 
-   # in cache already
-   SET(IPOD_FOUND TRUE)
- 
--else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
-   if(NOT WIN32)
-     # use pkg-config to get the directories and then use these values
-     # in the FIND_PATH() and FIND_LIBRARY() calls
--    INCLUDE(UsePkgConfig)
--  
--    PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags)
--  
--    set(IPOD_DEFINITIONS ${_IPODCflags})
-+    find_package(PkgConfig)
-+    PKG_SEARCH_MODULE(IPOD libgpod-1.0)
-+
-   endif(NOT WIN32)
-+  IF (IPOD_FOUND)
-+     IF (NOT IPOD_FIND_QUIETLY)
-+        MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}")
-+     ENDIF (NOT IPOD_FIND_QUIETLY)
-+  ELSE (IPOD_FOUND)
-+     IF (IPOD_FIND_REQUIRED)
-+        MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!")
-+     ENDIF (IPOD_FIND_REQUIRED)
-+  ENDIF (IPOD_FOUND)
-+
-+  MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS)
- 
--  FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0
--    ${_IPODIncDir}
--  )
--  
--  FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod
--    PATHS
--    ${_IPODLinkDir}
--  )
--
--  if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
--    SET(IPOD_FOUND TRUE)
--  else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
--    SET(IPOD_FOUND_FALSE)
--  endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
--
--  include(FindPackageHandleStandardArgs)
--  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES )
-- 
--  MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES)
--  
--endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
-diff -urN amarok-2.0.1.1.old/CMakeLists.txt amarok-2.0.1.1/CMakeLists.txt
---- amarok-2.0.1.1.old/CMakeLists.txt	2009-01-06 14:12:50.000000000 +0100
-+++ amarok-2.0.1.1/CMakeLists.txt	2009-02-10 18:22:23.000000000 +0100
-@@ -56,7 +56,10 @@
- macro_log_feature( GDK_FOUND "Gdk" "Support for artwork on iPod audio devices via GdkPixbuf" "http://developer.gnome.org/arch/imaging/gdkpixbuf.html" FALSE "2.0.x" "" )
- 
- macro_optional_find_package(Ipod)
--macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.6.0" "" )
-+if(IPOD_FOUND)
-+	macro_ensure_version("0.7.0" ${IPOD_VERSION} IPOD_0_7)
-+endif(IPOD_FOUND)
-+macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.7.0" "" )
- 
- #macro_optional_find_package(MySQL)
- #macro_log_feature( MYSQL_FOUND "mysql" "Store Collection in a mysql database instead of a sqlite one" "http://www.mysql.com" FALSE "4.1.0" "" )
-diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt
---- amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt	2009-01-06 13:49:32.000000000 +0100
-+++ amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt	2009-02-10 22:22:01.000000000 +0100
-@@ -17,7 +17,7 @@
-    handler
-    ${GLIB2_INCLUDE_DIR}
-    ${GDK_INCLUDE_DIR}
--   ${IPOD_INCLUDE_DIR}
-+   ${IPOD_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}/../..
-    ${AMAROK_COLLECTION_SUPPORT_DIR}
-    ${KDE4_INCLUDE_DIR}
-diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp
---- amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-01-06 13:49:32.000000000 +0100
-+++ amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp	2009-02-10 18:00:09.000000000 +0100
-@@ -1339,73 +1339,12 @@
-     QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
-     QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
- 
--    Itdb_Thumb *thumb = NULL;
-     GdkPixbuf *gpixbuf = NULL;
--    QString thumbPath;
- 
-     // pull image out of ipod
- 
--    if( ipodtrack->has_artwork == 0x01 )
--    {
--        // try small first
--
--        thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL );
--
--        // then large if needed
--        if( thumb == NULL)
--        {
--            thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE );
--        }
--
--        if( thumb != NULL)
--        {
--            gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
--        }
--        else
--        {
--            GList *thumbs = ipodtrack->artwork->thumbnails;
--
--            for(; thumbs; thumbs = thumbs->next)
--            {
--                Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data;
--                if( curThumb == NULL)
--                    continue;
--
--                switch( curThumb->type )
--                {
--                    case ITDB_THUMB_PHOTO_SMALL:
--                        break;
--                    case ITDB_THUMB_PHOTO_LARGE:
--                        break;
--                    case ITDB_THUMB_PHOTO_FULL_SCREEN:
--                        break;
--                    case ITDB_THUMB_PHOTO_TV_SCREEN:
--                        break;
--                    case ITDB_THUMB_COVER_XLARGE:
--                        break;
--                    case ITDB_THUMB_COVER_MEDIUM:
--                        break;
--                    case ITDB_THUMB_COVER_SMEDIUM:
--                        break;
--                    case ITDB_THUMB_COVER_XSMALL:
--                        break;
--
--                    default:
--                        break;
--                }
--
--                thumb = curThumb;
--                break;
--
--            }
--
--            if( thumb != NULL)
--            {
--                thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) );
--                gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
--            }
--        }
--    }
-+    if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false
-+		 gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 );
- 
-     if(gpixbuf != NULL)
-     {
diff --git a/media-sound/amarok/files/amarok-2.0.2-lastfm-authentication.patch b/media-sound/amarok/files/amarok-2.0.2-lastfm-authentication.patch
deleted file mode 100644
index cb47d0ad6ebd..000000000000
--- a/media-sound/amarok/files/amarok-2.0.2-lastfm-authentication.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/services/lastfm/LastFmServiceSettings.cpp
-+++ src/services/lastfm/LastFmServiceSettings.cpp
-@@ -94,14 +94,12 @@
-     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
- 
-     QString authToken =  md5( ( m_configDialog->kcfg_ScrobblerUsername->text() + md5( m_configDialog->kcfg_ScrobblerPassword->text().toUtf8() ) ).toUtf8() );
--    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
-     
-     // now authenticate w/ last.fm and get our session key
-     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
-     .add( "username", m_configDialog->kcfg_ScrobblerUsername->text() )
-     .add( "authToken", authToken )
-     .add( "api_key", Ws::ApiKey )
--    .add( "api_sig", sign_key )
-     .get();
-     
-     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
---- src/services/lastfm/LastFmService.cpp
-+++ src/services/lastfm/LastFmService.cpp
-@@ -115,14 +115,12 @@
-     debug() << "username:" << QString( QUrl::toPercentEncoding( Ws::Username ) );
- 
-     QString authToken =  md5( ( m_userName + md5( password.toUtf8() ) ).toUtf8() );
--    QString sign_key = md5( ( "api_key" + QString( Ws::ApiKey ) + "authToken" + authToken + "methodauth.getMobileSession" + QString( Ws::SharedSecret ) ).toUtf8() );
-     
-     // now authenticate w/ last.fm and get our session key
-     WsReply* reply = WsRequestBuilder( "auth.getMobileSession" )
-     .add( "username", m_userName )
-     .add( "authToken", authToken )
-     .add( "api_key", Ws::ApiKey )
--    .add( "api_sig", sign_key )
-     .get();
-     
-     connect( reply, SIGNAL( finished( WsReply* ) ), SLOT( onAuthenticated( WsReply* ) ) );
diff --git a/media-sound/amarok/files/amarok-ipod.patch b/media-sound/amarok/files/amarok-ipod.patch
deleted file mode 100644
index d4621d1d09dd..000000000000
--- a/media-sound/amarok/files/amarok-ipod.patch
+++ /dev/null
@@ -1,159 +0,0 @@
---- cmake/modules/FindIpod.cmake	2009-01-06 13:48:28.000000000 +0100
-+++ cmake/modules/FindIpod.cmake	2009-02-10 18:18:23.000000000 +0100
-@@ -2,45 +2,35 @@
- # Once done this will define
- #
- #  IPOD_FOUND - system has libgpod
--#  IPOD_INCLUDE_DIR - the libgpod include directory
-+#  IPOD_INCLUDE_DIRS - the libgpod include directory
- #  IPOD_LIBRARIES - Link these to use libgpod
--#  IPOD_DEFINITIONS - Compiler switches required for using libgpod
-+#  IPOD_CFLAGS - Compiler switches required for using libgpod
-+#  IPOD_VERSION - Version number of libgpod
- #
- 
--if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
- 
-   # in cache already
-   SET(IPOD_FOUND TRUE)
- 
--else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
-   if(NOT WIN32)
-     # use pkg-config to get the directories and then use these values
-     # in the FIND_PATH() and FIND_LIBRARY() calls
--    INCLUDE(UsePkgConfig)
--  
--    PKGCONFIG(libgpod-1.0 _IPODIncDir _IPODLinkDir _IPODLinkFlags _IPODCflags)
--  
--    set(IPOD_DEFINITIONS ${_IPODCflags})
-+    find_package(PkgConfig)
-+    PKG_SEARCH_MODULE(IPOD libgpod-1.0)
-+
-   endif(NOT WIN32)
-+  IF (IPOD_FOUND)
-+     IF (NOT IPOD_FIND_QUIETLY)
-+        MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}")
-+     ENDIF (NOT IPOD_FIND_QUIETLY)
-+  ELSE (IPOD_FOUND)
-+     IF (IPOD_FIND_REQUIRED)
-+        MESSAGE(FATAL_ERROR "Could NOT find libgpod-1, check FindPkgConfig output above!")
-+     ENDIF (IPOD_FIND_REQUIRED)
-+  ENDIF (IPOD_FOUND)
-+
-+  MARK_AS_ADVANCED(IPOD_INCLUDE_DIRS)
- 
--  FIND_PATH(IPOD_INCLUDE_DIR gpod/itdb.h /usr/include/gpod-1.0
--    ${_IPODIncDir}
--  )
--  
--  FIND_LIBRARY(IPOD_LIBRARIES NAMES gpod
--    PATHS
--    ${_IPODLinkDir}
--  )
--
--  if (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
--    SET(IPOD_FOUND TRUE)
--  else (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
--    SET(IPOD_FOUND_FALSE)
--  endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
--
--  include(FindPackageHandleStandardArgs)
--  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ipod DEFAULT_MSG IPOD_INCLUDE_DIR IPOD_LIBRARIES )
-- 
--  MARK_AS_ADVANCED(IPOD_INCLUDE_DIR IPOD_LIBRARIES)
--  
--endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES)
-+endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
-
---- src/collection/ipodcollection/CMakeLists.txt	2009-01-06 13:49:32.000000000 +0100
-+++ src/collection/ipodcollection/CMakeLists.txt	2009-02-10 22:22:01.000000000 +0100
-@@ -17,7 +17,7 @@
-    handler
-    ${GLIB2_INCLUDE_DIR}
-    ${GDK_INCLUDE_DIR}
--   ${IPOD_INCLUDE_DIR}
-+   ${IPOD_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}/../..
-    ${AMAROK_COLLECTION_SUPPORT_DIR}
-    ${KDE4_INCLUDE_DIR}
-
---- src/collection/ipodcollection/handler/IpodHandler.cpp	2009-01-06 13:49:32.000000000 +0100
-+++ src/collection/ipodcollection/handler/IpodHandler.cpp	2009-02-10 18:00:09.000000000 +0100
-@@ -1339,73 +1339,12 @@
-     QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
-     QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
- 
--    Itdb_Thumb *thumb = NULL;
-     GdkPixbuf *gpixbuf = NULL;
--    QString thumbPath;
- 
-     // pull image out of ipod
- 
--    if( ipodtrack->has_artwork == 0x01 )
--    {
--        // try small first
--
--        thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_SMALL );
--
--        // then large if needed
--        if( thumb == NULL)
--        {
--            thumb = itdb_artwork_get_thumb_by_type ( ipodtrack->artwork, ITDB_THUMB_COVER_LARGE );
--        }
--
--        if( thumb != NULL)
--        {
--            gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
--        }
--        else
--        {
--            GList *thumbs = ipodtrack->artwork->thumbnails;
--
--            for(; thumbs; thumbs = thumbs->next)
--            {
--                Itdb_Thumb *curThumb = ( Itdb_Thumb * )thumbs->data;
--                if( curThumb == NULL)
--                    continue;
--
--                switch( curThumb->type )
--                {
--                    case ITDB_THUMB_PHOTO_SMALL:
--                        break;
--                    case ITDB_THUMB_PHOTO_LARGE:
--                        break;
--                    case ITDB_THUMB_PHOTO_FULL_SCREEN:
--                        break;
--                    case ITDB_THUMB_PHOTO_TV_SCREEN:
--                        break;
--                    case ITDB_THUMB_COVER_XLARGE:
--                        break;
--                    case ITDB_THUMB_COVER_MEDIUM:
--                        break;
--                    case ITDB_THUMB_COVER_SMEDIUM:
--                        break;
--                    case ITDB_THUMB_COVER_XSMALL:
--                        break;
--
--                    default:
--                        break;
--                }
--
--                thumb = curThumb;
--                break;
--
--            }
--
--            if( thumb != NULL)
--            {
--                thumbPath = QString::fromUtf8( itdb_thumb_get_filename( m_device, thumb ) );
--                gpixbuf = (GdkPixbuf*) itdb_thumb_get_gdk_pixbuf( m_device, thumb );
--            }
--        }
--    }
-+    if( ipodtrack->has_artwork == 0x01 ) // 0x01 = true ; 0x02 = false
-+		 gpixbuf = (GdkPixbuf*) itdb_artwork_get_pixbuf( m_device, ipodtrack->artwork, 50, 50 );
- 
-     if(gpixbuf != NULL)
-     {