Remove old.

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

8 files changed, 7 insertions, 667 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 1721dc4af1b4..667a838e96ad 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.460 2013/08/19 14:29:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.461 2013/08/21 15:31:00 kensington Exp $
+
+  21 Aug 2013; Michael Palimaka <kensington@gentoo.org> -amarok-2.5.0-r4.ebuild,
+  -amarok-2.6.0.ebuild, -amarok-2.7.0.ebuild, -amarok-2.7.1.ebuild,
+  -files/amarok-2.5.0-fix-context-view-on-startup.patch,
+  -files/amarok-2.5.0-kde48.patch, -files/amarok-2.5.0-qtdebug.patch:
+  Remove old.
 
 *amarok-2.7.1-r1 (19 Aug 2013)
 
diff --git a/media-sound/amarok/amarok-2.5.0-r4.ebuild b/media-sound/amarok/amarok-2.5.0-r4.ebuild
deleted file mode 100644
index e2933c8de617..000000000000
--- a/media-sound/amarok/amarok-2.5.0-r4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.5.0-r4.ebuild,v 1.8 2013/05/30 12:09:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="af ar ast be bg bs ca ca@valencia cs csb da de el en_GB eo es et
-eu fa fi fr ga gl he hr hu is it ja km ko ku lt lv mai ml ms nb nds ne nl nn
-oc pa pl pt pt_BR ro ru se si sk sl sq sr sr@ijekavian sr@ijekavianlatin
-sr@Latn sv tg th tr ug uk wa zh_CN zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl 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="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)?')
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.6.1[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtscript:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		|| (
-			$(add_kdebase_dep audiocd-kio)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( =media-libs/liblastfm-0.3* )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		dev-qt/qtcore:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.0-kde48.patch"
-	"${FILESDIR}/${PN}-2.5.0-qtdebug.patch"
-	"${FILESDIR}/${PN}-2.5.0-fix-context-view-on-startup.patch"
-)
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	# Mygpo-qt not yet in portage, add IUSE when available
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_Mygpo-qt=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)
-		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	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 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://amarok.kde.org/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 "virtual/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
-}
diff --git a/media-sound/amarok/amarok-2.6.0.ebuild b/media-sound/amarok/amarok-2.6.0.ebuild
deleted file mode 100644
index cc7771df9952..000000000000
--- a/media-sound/amarok/amarok-2.6.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.6.0.ebuild,v 1.8 2013/05/30 12:09:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca cs da de el en_GB es et eu fi ga gl hu it ja lt lv nb nl pa
-pl pt pt_BR ru sl sr sr@latin sv uk zh_TW"
-KDE_SCM="git"
-KDE_REQUIRED="never"
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl 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="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)?')
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-	dev-qt/qtscript:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		|| (
-			$(add_kdebase_dep audiocd-kio)
-			$(add_kdebase_dep kdemultimedia-kioslaves)
-		)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( =media-libs/liblastfm-0.3* )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		dev-qt/qtcore:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=ON
-		$(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)
-		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	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 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://amarok.kde.org/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 "virtual/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
-}
diff --git a/media-sound/amarok/amarok-2.7.0.ebuild b/media-sound/amarok/amarok-2.7.0.ebuild
deleted file mode 100644
index cd3fbd95e007..000000000000
--- a/media-sound/amarok/amarok-2.7.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.0.ebuild,v 1.8 2013/05/30 12:09:02 kensington Exp $
-
-EAPI=4
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ppc x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl semantic-desktop test +utils"
-
-if [[ ${PV} == *9999* ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)?' 4.8.4)
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-	semantic-desktop? ( >=kde-base/nepomuk-core-4.9.0 )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=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)
-		$(cmake-utils_use_with ofa LibOFA)
-		$(cmake-utils_use_with semantic-desktop Nepomuk)
-		$(cmake-utils_use_with semantic-desktop Soprano)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	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
-
-	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://amarok.kde.org/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 "virtual/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
-}
diff --git a/media-sound/amarok/amarok-2.7.1.ebuild b/media-sound/amarok/amarok-2.7.1.ebuild
deleted file mode 100644
index 5df93342c0f0..000000000000
--- a/media-sound/amarok/amarok-2.7.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.7.1.ebuild,v 1.5 2013/07/01 09:06:50 ago Exp $
-
-EAPI=5
-
-KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr
-ga gl hu it ja lt lv nb nl pa pl pt pt_BR ru sl sr sr@ijekavian
-sr@ijekavianlatin sr@latin sv uk zh_CN zh_TW"
-KDE_REQUIRED="never"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-base
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	if [[ $PV == *[6-9][0-9]* ]]; then
-		SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
-	else
-		SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-	fi
-	KEYWORDS="amd64 ppc x86"
-else
-	KEYWORDS=""
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="cdda daap debug +embedded ipod lastfm mp3tunes mtp ofa opengl test +utils"
-
-if [[ ${PV} == *9999* ]]; then
-	RESTRICT="test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	app-crypt/qca:2
-	>=app-misc/strigi-0.5.7
-	$(add_kdebase_dep kdelibs 'opengl?,semantic-desktop(+)' 4.8.4)
-	$(add_kdebase_dep kdebase-kioslaves)
-	>=media-libs/taglib-1.7[asf,mp4]
-	>=media-libs/taglib-extras-1.0.1
-	$(add_kdebase_dep nepomuk-core '' 4.9.0)
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(add_kdebase_dep audiocd-kio)
-	)
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3 )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl
-		net-libs/loudmouth
-		net-misc/curl
-		>=dev-qt/qtcore-4.8.4:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdebase_dep phonon-kde)
-"
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-	local mycmakeargs
-
-	mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=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)
-		$(cmake-utils_use_with ofa LibOFA)
-	)
-
-	mycmakeargs+=(
-		$(cmake-utils_use_with utils UTILITIES)
-	)
-
-	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
-
-	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://amarok.kde.org/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 "virtual/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
-}
diff --git a/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch b/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch
deleted file mode 100644
index f39113b11fdf..000000000000
--- a/media-sound/amarok/files/amarok-2.5.0-fix-context-view-on-startup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit a0f4288e0b952830d38151264c0a8b042e32d8a4
-Author: Matěj Laitl <matej@laitl.cz>
-Date:   Tue Jun 26 00:42:50 2012 +0200
-
-    Fix Context view not being fully formed on startup
-    
-    Something from inside Plasma tries to resize context view's sceneRect()
-    to 200x200 px. I don't know why this happens, but let's hope we'll have
-    QML context view soon, so don't investigate and use a work-around.
-    
-    BUG: 292895
-    FIXED-IN: 2.6
-    DIGEST: popular bug fixed in Amarok
-
-diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-index a23305f..8fa6f9b 100644
---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
-     if(!view())
-         return;
- 
--    QRectF rect = view()->sceneRect();
-+    // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
-+    QRectF rect( view()->pos(), view()->maximumViewportSize() );
-     setGeometry( rect );
-     m_applets->setGeometry( rect );
-     m_applets->refresh();
diff --git a/media-sound/amarok/files/amarok-2.5.0-kde48.patch b/media-sound/amarok/files/amarok-2.5.0-kde48.patch
deleted file mode 100644
index b110eeb1018f..000000000000
--- a/media-sound/amarok/files/amarok-2.5.0-kde48.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/src/context/ToolbarView.cpp b/src/context/ToolbarView.cpp
-index f3b4916..840b99b 100644
---- a/src/context/ToolbarView.cpp
-+++ b/src/context/ToolbarView.cpp
-@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
-     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
- 
-     // now we create the toolbar
--    m_toolbar = new AppletToolbar( containment );
-+    m_toolbar = new AppletToolbar(0);
-+    scene->addItem(m_toolbar.data());
-+    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
-     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
-     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
- 
-@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasma::Containment* containment, QGraphicsSc
- 
- Context::ToolbarView::~ToolbarView()
- {
--
-+    delete m_toolbar.data();
- }
- 
- void
-diff --git a/src/context/toolbar/AppletToolbar.cpp b/src/context/toolbar/AppletToolbar.cpp
-index 0e0deb5..c51762c 100644
---- a/src/context/toolbar/AppletToolbar.cpp
-+++ b/src/context/toolbar/AppletToolbar.cpp
-@@ -67,6 +67,19 @@ Context::AppletToolbar::~AppletToolbar()
- }
- 
- void
-+
-+Context::AppletToolbar::setContainment( Containment * containment )
-+{
-+    m_cont = containment;
-+}
-+
-+Context::Containment *
-+Context::AppletToolbar::containment() const
-+{
-+    return m_cont;
-+}
-+
-+void
- Context::AppletToolbar::resizeEvent( QGraphicsSceneResizeEvent * event )
- {
-     debug() << "setting layout to" << QRectF( QPointF( 0, 0 ), event->newSize() );
-diff --git a/src/context/toolbar/AppletToolbar.h b/src/context/toolbar/AppletToolbar.h
-index ee8a208..058baae 100644
---- a/src/context/toolbar/AppletToolbar.h
-+++ b/src/context/toolbar/AppletToolbar.h
-@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWidget
-         
-         void appletRemoved( Plasma::Applet* applet );
- 
-+        void setContainment( Containment * containment );
-+        Containment* containment() const;
-+
-     signals:
-         void showApplet( Plasma::Applet* );
-         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
diff --git a/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch b/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch
deleted file mode 100644
index 8c6e0223b0dd..000000000000
--- a/media-sound/amarok/files/amarok-2.5.0-qtdebug.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Patch originally from KDE commit d1a1c80370e4132c26fa636308822fdb3aa1b2e6, modified to work with current Amarok.
-diff -ruN /root/amarok-2.5.0/ChangeLog amarok-2.5.0/ChangeLog
---- a/amarok-2.5.0/ChangeLog	2011-12-15 02:36:48.000000000 -0500
-+++ b/amarok-2.5.0/ChangeLog	2012-06-21 21:05:29.871236927 -0400
-@@ -8,6 +8,7 @@
-       Playlist's layout items.
- 
-   BUGFIXES:
-+    * Fix crash on start when Qt is build with debugging assertions. (BR 285720)
-     * Do not crash when iPod doesn't have a master playlist. (BR 288936)
-     * Fix Last.fm not finding KDE Wallet. (BR 286741)
-     * Put a border around bottom toolbars, visually separating them from
-diff -ruN /root/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp
---- a/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp	2011-12-15 02:36:48.000000000 -0500
-+++ b/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.cpp	2012-06-21 21:05:09.810237474 -0400
-@@ -223,23 +223,15 @@
-         {
-             int &rowValue = groupList[insertedProxyRow-1];
-             if( idx.row() <= rowValue )
--            {
-                 //increment the rows that come after the new row since they moved one place up.
-                 rowValue++;
--            }
-             else
--            {
-                 break;
--            }
-         }
- 
-         if( updatedGroups.contains( i.key() ) )
--        {
--            //the row needs to be added to this group
--            beginInsertRows( index( i.key() ), insertedProxyRow, insertedProxyRow );
--            groupList.insert( insertedProxyRow, idx.row() );
--            endInsertRows();
--        }
-+            // we're inside beginInsertRows() or beginInsertRows(), don't re-enter it.
-+	     groupList.insert( insertedProxyRow, idx.row() );
-     }
- 
-     return updatedGroups;
-diff -ruN /root/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h
---- a/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h	2011-12-15 02:36:48.000000000 -0500
-+++ b/amarok-2.5.0/src/browsers/playlistbrowser/QtGroupingProxy.h	2012-06-21 21:04:42.778238198 -0400
-@@ -38,8 +38,8 @@
-         void setGroupedColumn( int groupedColumn );
- 
-         /* QAbstractProxyModel methods */
--        virtual QModelIndex index( int, int c = 0,
--                                   const QModelIndex& parent = QModelIndex() ) const;
-+	virtual QModelIndex index( int row, int column = 0,
-+				    const QModelIndex& parent = QModelIndex() ) const;
-         virtual Qt::ItemFlags flags( const QModelIndex &idx ) const;
-         virtual QModelIndex parent( const QModelIndex &idx ) const;
-         virtual int rowCount( const QModelIndex &idx = QModelIndex() ) const;