Remove old.

Package-Manager: portage-2.2.0_alpha121/cvs/Linux x86_64

7 files changed, 16 insertions, 290 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 609b138d6c2d..2ec998fdd64f 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.435 2012/08/22 22:59:15 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.436 2012/08/22 23:17:45 johu Exp $
+
+  22 Aug 2012; Johannes Huber <johu@gentoo.org> -amarok-2.4.3-r1.ebuild,
+  -files/amarok-2.3.2-fix-qt-regression.patch,
+  -files/amarok-2.3.2-flac-fix.patch,
+  -files/amarok-2.4.0.90-fix-plugin-detection.patch,
+  -files/amarok-fix-upnp-dep.patch:
+  Remove old.
 
   22 Aug 2012; Michael Weber <xmw@gentoo.org> amarok-2.5.0-r4.ebuild:
   ppc stable (bug 418321).
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index fb68404080a7..8ba482eb49ef 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,25 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX amarok-2.3.2-fix-qt-regression.patch 2958 SHA256 2f2a77552a06e6ec30106d8cb1f012f3f4213ac3354e64c7fe7f6933deb6d6ab SHA512 11593a7be35c533bfef88d0683c34fb8c5e42652c0500422c7d89030115b6a14b047bb06468d0fbb4a5748b4d213d9ddab838ead973c8a5dc7dbef8e3190fae9 WHIRLPOOL 45d8341d22be5f5bee2cf948d3ca31c021fb10e6f048efd8c8bc4e34ace29984bde8d9a93a1c1a8eec5e41a5ed4ffa9135f71059a9dd5309100b766e901600ae
-AUX amarok-2.3.2-flac-fix.patch 1233 SHA256 f68f3c9b4fb8be02a37ac21d535d417b8fa6167d123e6e13e98c26fb758e40f1 SHA512 5ca8d8fdd2afb7423e03803bb8409756cbaf1986b9744b0962ded599a680df89f2ee2ff90bcbc6f1a83769b24391893c268ad586a15af13646dfb25b245067ac WHIRLPOOL 1b82bfeea2c5cc775ef40dace49478e5af1a2f82e0e38395fe1f0eb523e7945bdbdcf9dab88f27db548e8cb4801bb24ca28897195079b93e187984d14b96dbc9
-AUX amarok-2.4.0.90-fix-plugin-detection.patch 623 SHA256 aae0ceca58b36ae714516fe46f1a4011836a3e3256a7efd106fdb8568e1fdbcf SHA512 8ee5ecee47ee7590c7888081dc2a6c1fca925e56f39c8fe2354afba2c58f5aab2af84c33962291506b0c861220b31e30fea808fbb6daeb4e93918b3935a8df6f WHIRLPOOL 47dd4592d7a3a16511f86e09f740604adb179b817856680b260ebbeacf07d8075b7067d05a282e262142f88215b891624434d1a2f25658ccfd52242214c1332f
 AUX amarok-2.5.0-fix-context-view-on-startup.patch 1217 SHA256 8e9c224ff81a2d39898820a4a219a589fc9dd12c2cdea7d159db5329179fb49c SHA512 5a73ca88ed7503f69d999ca76f952d7681b172de1e12edff872e164db66d24bc92d89f696e69dbaa85ab55c82b776bf1e4876ffb4db4e67d5e80782efe436238 WHIRLPOOL 13e244cc9f645736469cb4fa991af74ee7d389914494fa6886c685dd41b8b7fbf8de5c417a43de8ad1d27e7c8465f59e627e4e27db469da4c847fe99101d479e
 AUX amarok-2.5.0-kde48.patch 2111 SHA256 4ee6b27d79d42e7fbb5469f46c3ebaf69eef73ff83cb0882e44f4d993ba0ce51 SHA512 27dfba494cf2a12db9b2300de3c2b217c1b84945daa32881152f9e9eddea637ace74ff37cf7d3855a405c6618bfeb45929600e0fedbffc255e91c7dbc5663e8e WHIRLPOOL 3f8968ecd3209dd284de1cae6138613a5c3ab2240f8bd3357884032424f3450b93d0c27f8ede70b6bd5f9136a249cd33508ac0c3df325184edc28c5eab389ada
 AUX amarok-2.5.0-qtdebug.patch 2787 SHA256 a2b4ff34c38741979a76b96e0a741e5da7cadecc1a592035e10773b233d38f29 SHA512 5ea1523e16d9889a027866ee5e3f8bf8bb9efe743f55f7b5871aa6ef1a8f5341744b6858547251a9f472f840911cc516f247021659280a28f35eed41e27f5f85 WHIRLPOOL e2b8a58ad15e3d76e0a66befa044dd5b32e3838ddd0a94f767d723288c40854d257e1fe110f5b13c57b1d5842a47a4489c60711f9c8240c67dfc67524a2a24a6
-AUX amarok-fix-upnp-dep.patch 1896 SHA256 e88481548d77d334adb51250ee2e70186249ee51164f060382a7b1ee2c6839d6 SHA512 7bc7f42ffed5501bd7479705228f4dbb0219f7e3375483bad38f4097ce636390bcde97bbf88d219f2f2af8c034333791086d7854c98fb6da9fabc0a077b9af7b WHIRLPOOL aed5d81ed31de6230f4a142b6668f73a730b1a383de75b94a0c08f6718ae6ec8197346079343a95f8f87c862b666972a04c1686cba5cee40af6e841265dff46d
-DIST amarok-2.4.3.tar.bz2 17468203 SHA256 6ce448ecd30cc3d45211617636904e3662c2082441b79ca1e36685c8b0be8208 SHA512 68a06a92f354b6ecd9e888c57f0d3dccf29d1029f4d877a80853daf9846863ad9e5195cce2335a3fca46ebed49e8d767c09211a1661a331a53a59fbab518b6cb WHIRLPOOL 692610428f5a1db37bd430e38f9efd49f5b061c2e19d49d6545b016d4e54a69bb82721b2a200ade3bf35da1aa46e05e8d355d49879056a7125ea0f8c99b3d81a
 DIST amarok-2.5.0.tar.bz2 46607238 SHA256 1ed191db290fdede7c910c322cff2aba8ecfc1c4af891508d9ee410db3768849 SHA512 ac195f627ed0b1daba4b3a2896048d445caa85310b3373b373cabc76c36f424a60f2a3a439012363f3022c0ddb85a6770f2debd5b1a6e009e067bc5329d284c6 WHIRLPOOL e2256ae5dc941016afc9c3798b8f4ee4275dd23085b520067d6f24fa682ce465254d251c3494208a679441058771226668d5b500cb84851ccdd5b48584bb73bc
 DIST amarok-2.6.0.tar.bz2 42331208 SHA256 a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0 SHA512 da67876dfc41dcc3e1f3087698d36dabb43a339cef1669ca0518de191e2d9dd2e3e72122ffe76ecfd763e83547e46c55bba8606c095d35c85058df77bf35fb4a WHIRLPOOL 70fadaff2565fc2e9d8cb628942ec8107c6f4fcea0bd3e898f4ba6a72231ebaca8cb1d924f1413ced7c82940790438c9dcbe2fba7760e356b100eb832d8a2edc
-EBUILD amarok-2.4.3-r1.ebuild 3266 SHA256 4c667dcc5c1eeb180425f1a21672c89b10cd6524202aaf73fae021753f700e41 SHA512 864803b8363974a64be9bacd4edcfc54903f9c1589ff2432e3c19b4146e98e4290d3d0280e6789cdbb90f9d323ec6897b212cadc9adc1967bc39fe9ff063d55c WHIRLPOOL 7b5db4ebf4132e17fc93a989fa16c2bbefd5d2dcfdefa754cfdef397db067a11b3c539a591390e9bfcb365fd078c058d850f0394be82bd87d5fb2b5745b915d2
 EBUILD amarok-2.5.0-r4.ebuild 3809 SHA256 4e31bbdf07649a51a66581930d595d721d1bc1f3900d4defc93c22cfa813ef41 SHA512 95505ac6a8b7db7b00ea121317c3d9e2335f59a8d51df8793d431a71c8b4f47a7ec37d1a4c04592ee8a3741200e1b1c66f2db7cac93cf6e30fef22f148310950 WHIRLPOOL 13c593836986aec2612d10217534e013c4d8532ff6ca7430971936f7a88e056b625e9cc6200a663fbb1b58cbd99e0e58a4571c30bf038adc37ad36811fa5ea10
 EBUILD amarok-2.6.0.ebuild 3463 SHA256 7be4151c93dcf96c332e51f266c9f58c577bb48b8381f5cb0483ba360cf41960 SHA512 42680e45509acd53dff06bc2874f533c524ce8daca783b376395be373cf432031fd8b32889eced11d542da59def219040cccc7bfa2ba2056279ab067f0086580 WHIRLPOOL 0f37f7d7f007b2ce2ded7a0681f9561b501b2ab9cc3dc5b9c7a838c24d4fdf65954cefe3f7f0da8ae6e811fcdfbdc40ee13101dbd7c28ee39dca597e260db45e
-MISC ChangeLog 74757 SHA256 d75b44c5179be86d1d7d4392c82b81435b58e431f39a61b9bae468dba3226ab7 SHA512 0c7cecc9368d4bd2474e44d6ef81b9a71cd7ea69a0b304c3a518ebc03d9ff9e25e20b4c3ee284a2fcf619f0f4e299aae80de429dbdb54c61cbfaffa4c9dbfecc WHIRLPOOL 6c739ab9af290cebf85f6eb591bc082e3be95721bd925154a228195f1325873d1fb7818805d63de767427da58fc27afd7129064c94d7ed30a7beef24fdebe3fb
+MISC ChangeLog 75020 SHA256 16b431f03eba1467bc1b6badea18e6bb1fb4b1b3ea5ea7ecf4488c4af1fbc07f SHA512 283114de51ecd3e21072a3a3fef63571c5b35448fdb5a396b374e6a3614de1438281b56abe820cb23fd31ceaf50241dc2448d4aefc27178a1431dfa2f5da988c WHIRLPOOL 2359ab14ebd2fba317a706e08d33968b0c47154389942425b6250a77b760be48761194f692a8dd68ad6cf5f7cffb0c0b97b43aa3f6b0fd62a4723bc1ef3a05be
 MISC metadata.xml 1283 SHA256 dbd309064732531993f21257f6db969c681545fcf7dd4766daac33bb41da0451 SHA512 f61fc22596e31125cd7e4964d0699527e79fb5bf39e7708c1051eb1a3bf9f23dbc4310f9e94da58672a81d1a93c57b7924d84fb8af86e9ac78962b0ee3ffee7f WHIRLPOOL 3e408437f2857ba19314e17056da6204226e42362cccc75fe2c26931499b2c05abb6c672255dc29682bd77f2acb069e36dac568daf13a388a047a6cf616a13d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlA1ZEgACgkQknrdDGLu8JDEywEAjQqmZp1/CamZ+f/qTfVnyKHy
-0p+b5K/alxkfLDh5bIoA/0JKHt0eUDx2cbUQ1NqKWUF9m+Vt1w5HdBN44tC3iDOc
-=kTwR
+iQEcBAEBCAAGBQJQNWiiAAoJEO+t9ga+3I3aJoUIAKeL44hAEZTorjEy4a87j8Di
+P0s2WoaltoQMjSpbWu9+2Xhf/TCdNqueVrvYUXTT6/KjzbJ4YBtaq+ow7upTXA5b
+zqkC5C03H+xpTTgjarf1mSVPFL3OupIb5xQnLIpzvPDGXpKbT3+JNmm1Bhbma8x0
+2t4qOpQqS6svYM9IwkOTJfoJxJCvQVMPaGPhDACETUwMOQT5xfVEKpNWg+dnJ59O
+HuGYRFHDAeEw5QGNWwhUDg66DMUEW2iKvB89d3XTgyPdkIKQBcRfuxO1F2jg+iPX
+eNGHa/iLccVeew0S9to+/wcDwjiESUGAEll2Y6f7uhHqqx1Z66KiborYCBqKG80=
+=HTOn
 -----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-2.4.3-r1.ebuild b/media-sound/amarok/amarok-2.4.3-r1.ebuild
deleted file mode 100644
index ba7a7e1bb329..000000000000
--- a/media-sound/amarok/amarok-2.4.3-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.4.3-r1.ebuild,v 1.7 2012/07/19 15:56:45 kensington Exp $
-
-EAPI=4
-
-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"
-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 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?]
-	x11-libs/qt-script:4
-	>=x11-libs/qtscriptgenerator-0.1.0
-	cdda? (
-		$(add_kdebase_dep libkcddb)
-		$(add_kdebase_dep libkcompactdisc)
-		$(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
-		x11-libs/qt-core:4[glib]
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	opengl? ( virtual/opengl )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-"
-RDEPEND="${COMMONDEPEND}
-	$(add_kdebase_dep phonon-kde)
-	!media-sound/amarok-utils
-"
-
-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
-		$(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)
-	)
-
-	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/files/amarok-2.3.2-fix-qt-regression.patch b/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
deleted file mode 100644
index 4e8faec3ad9a..000000000000
--- a/media-sound/amarok/files/amarok-2.3.2-fix-qt-regression.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From 79d86829294ac54132c01153660e70e30c15c378 Mon Sep 17 00:00:00 2001
-From: Jeff Mitchell <mitchell@kde.org>
-Date: Wed, 22 Sep 2010 18:15:17 -0400
-Subject: [PATCH] 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 tell them to.
-
-Also switch to QXmlStreamWriter, as apparently going forward it is the more supported class.
-
-BUG: 251762
----
- utilities/collectionscanner/CollectionScanner.cpp |   27 +++++++++++++-------
- 1 files changed, 17 insertions(+), 10 deletions(-)
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index 0a23a53..28c554b 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/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 QString &path, TagLib::AudioProperties::ReadS
- 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 QString &name, const AttributeHash &attri
-         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() < 20 &&
-+                    data[i].unicode() != 9 &&
-+                    data[i].unicode() != 10 &&
-+                    data[i].unicode() != 13
-+                )
-+            )
-             {
-                 noCategory = true;
-                 break;
-@@ -838,15 +848,12 @@ CollectionScanner::writeElement( const QString &name, const AttributeHash &attri
- 
-         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
--- 
-1.7.0.4
-
diff --git a/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch b/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
deleted file mode 100644
index 341582658c46..000000000000
--- a/media-sound/amarok/files/amarok-2.3.2-flac-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit ce57e4264d0395b15e7253e3cdef48e36a8b129c
-Author: Jeff Mitchell <mitchell@kde.org>
-Date:   Fri Sep 17 13:02:38 2010 -0400
-
-    FLAC BPM tags could be read in incorrectly.
-    
-    BUG: 234166
-
-diff --git a/utilities/collectionscanner/CollectionScanner.cpp b/utilities/collectionscanner/CollectionScanner.cpp
-index a9d6755..0a23a53 100644
---- a/utilities/collectionscanner/CollectionScanner.cpp
-+++ b/utilities/collectionscanner/CollectionScanner.cpp
-@@ -701,7 +701,7 @@ CollectionScanner::readTags( const QString &path, TagLib::AudioProperties::ReadS
-                     attributes["composer"] = TStringToQString( file->xiphComment()->fieldListMap()["COMPOSER"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "BPM" ].isEmpty() )
--                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed().toFloat();
-+                    attributes["bpm"] = TStringToQString( file->xiphComment()->fieldListMap()["BPM"].front() ).trimmed();
- 
-                 if ( !file->xiphComment()->fieldListMap()[ "DISCNUMBER" ].isEmpty() )
-                     disc = TStringToQString( file->xiphComment()->fieldListMap()["DISCNUMBER"].front() ).trimmed();
\ No newline at end of file
diff --git a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch b/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
deleted file mode 100644
index d075ba048601..000000000000
--- a/media-sound/amarok/files/amarok-2.4.0.90-fix-plugin-detection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28
-Author: Rick W. Chen <stuffcorpse@archlinux.us>
-Date:   Thu Mar 17 18:38:19 2011 +1300
-
-    Fix plugin loading and bump_plugin_version.rb script
-
-diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
-index ff52646..1e34510 100644
---- a/src/PluginManager.cpp
-+++ b/src/PluginManager.cpp
-@@ -32,7 +32,7 @@
- #include <QFile>
- #include <QMetaEnum>
- 
--const int Plugins::PluginManager::s_pluginFrameworkVersion = 60;
-+const int Plugins::PluginManager::s_pluginFrameworkVersion = 61;
- Plugins::PluginManager* Plugins::PluginManager::s_instance = 0;
- 
- Plugins::PluginManager*
diff --git a/media-sound/amarok/files/amarok-fix-upnp-dep.patch b/media-sound/amarok/files/amarok-fix-upnp-dep.patch
deleted file mode 100644
index 878c013fa972..000000000000
--- a/media-sound/amarok/files/amarok-fix-upnp-dep.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -urN amarok-2.4.0.90.orig/CMakeLists.txt amarok-2.4.0.90/CMakeLists.txt
---- amarok-2.4.0.90.orig/CMakeLists.txt	2011-04-19 00:03:27.910000016 +0000
-+++ amarok-2.4.0.90/CMakeLists.txt	2011-04-19 00:06:17.466666683 +0000
-@@ -105,6 +105,10 @@
-     macro_optional_find_package(QJSON)
-     macro_log_feature( QJSON_FOUND "QJson" "Qt JSON Parser used for the Playdar Collection" "http://qjson.sourceforge.net/" FALSE "" "" )
- 
-+    # HUpnp is required for the upnp plugin
-+    macro_optional_find_package(HUpnp)
-+    macro_log_feature ( HUPNP_FOUND "HUpnp" "HUpnp is an universal Plug and Play Library" "http://herqq.org/" FALSE "" "" )
-+
-     # macro_optional_find_package(Strigi)
-     # macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" "http://strigi.sourceforge.net" FALSE "" "" )
- 
-diff -urN amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt
---- amarok-2.4.0.90.orig/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:03:27.940000015 +0000
-+++ amarok-2.4.0.90/src/core-impl/collections/CMakeLists.txt	2011-04-19 00:07:06.753333348 +0000
-@@ -25,4 +25,6 @@
- if( QJSON_FOUND )
-     add_subdirectory( playdarcollection )
- endif( QJSON_FOUND )
--add_subdirectory( upnpcollection )
-+if( HUPNP_FOUND )
-+    add_subdirectory( upnpcollection )
-+endif( HUPNP_FOUND )
-diff -urN amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake
---- amarok-2.4.0.90.orig/cmake/modules/FindHUpnp.cmake	2011-04-19 01:59:14.313333349 +0000
-+++ amarok-2.4.0.90/cmake/modules/FindHUpnp.cmake	2011-04-19 02:14:13.670000016 +0000
-@@ -6,7 +6,7 @@
- # HUPNP_LIBRARIES
- # HUPNP_FOUND
- 
--find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR})
-+find_path(HUPNP_INCLUDE_DIR HUpnp HINTS ${KDE4_INCLUDE_DIR} /usr/include/HUpnpCore)
- 
- find_library(HUPNP_LIBRARIES HUpnp PATHS ${KDE4_LIB_DIR})
-