Removed old versions of amarok-1.4 and the 1.4.9999 version as upstream work on 1.4 has been stopped.

Added blockers for other versions of amarok to prevent the merge process from dying for colisions - fixes bug 241134.
Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

12 files changed, 126 insertions, 751 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index c016b35aa544..f865674ced3a 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.312 2009/03/19 12:51:12 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.313 2009/04/14 03:05:15 jmbsvicetto Exp $
+
+*amarok-1.4.10-r3 (14 Apr 2009)
+
+  14 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  metadata.xml, -amarok-1.4.8.ebuild, -amarok-1.4.9.1.ebuild,
+  -amarok-1.4.9.1-r1.ebuild, -amarok-1.4.10.ebuild,
+  -amarok-1.4.10-r1.ebuild, +amarok-1.4.10-r3.ebuild,
+  -amarok-1.4.10_p20090130.ebuild, amarok-1.4.10_p20090130-r1.ebuild,
+  -amarok-1.4.9999-r2.ebuild, amarok-2.0.1.1.ebuild:
+  Removed old versions of amarok-1.4 and the 1.4.9999 version as upstream
+  work on 1.4 has been stopped. Added blockers for other versions of amarok
+  to prevent the merge process from dying for colisions - fixes bug 241134.
 
   19 Mar 2009; Brent Baude <ranger@gentoo.org> amarok-1.4.10-r2.ebuild:
   Marking amarok-1.4.10-r2 ppc for bug 254896
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index fa45f7a63bf5..23cd5603172d 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -7,18 +7,10 @@ AUX amarok-1.4.9.1-helix+gcc-4.3.patch 435 RMD160 2ebf5155e052d90e027d207820bd43
 AUX amarok-1.4.9.1-libmtp-0.3.0-API.patch 1912 RMD160 475852fde4ad1e27cc093d9435a4b525492e0156 SHA1 b211ad82d9abc49dd3a51260ba597cfaa78d9f6b SHA256 87583a40c4e13eae7a5364dc5b98dd83885c216e662c05c4de7c1de9739f6d9c
 DIST amarok-1.4.10-post20090130.diff.tar.bz2 4050 RMD160 e1b871213d7658081ffd396a1a208f97c3f10752 SHA1 8aa7492e91529ce1e01f3d2ee8183b7d7da7cb83 SHA256 64924546008abf88f7f776b27afe3de539defcd212c79c62c6abd90a7174dbe0
 DIST amarok-1.4.10.tar.bz2 12812583 RMD160 f86c71dd0459e0cf1ff586cd6de240ca6501cf62 SHA1 cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd SHA256 4b28f86e81447b94d33c35aa0cff65d59d85da74fde2a86c5c7862c048509c9b
-DIST amarok-1.4.8.tar.bz2 12699378 RMD160 b557f6f5f14c304ae82c8d5537263ecc1faa922e SHA1 8051efa40483271fe6b7d229da9b4d7af3142348 SHA256 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
-DIST amarok-1.4.9.1.tar.bz2 12707926 RMD160 9f6e59116292bd33e10c0245bfdbd3a2df319765 SHA1 5473c7d578a4bf2662f977d9239ff0066ee8f159 SHA256 c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
 DIST amarok-2.0.1.1.tar.bz2 5012905 RMD160 d7d159d5407231f787397b0bbc57623ebcc75785 SHA1 235ff1b62c10f2bb8cb30fb256fcdd3704a132d7 SHA256 905a4b4344ddee5f77c0e158c2a28e4d282a3dc93cff635c6ff10ddac86c0f2b
-EBUILD amarok-1.4.10-r1.ebuild 3092 RMD160 d70b9dccb9cd14e582697d80f419e9cc8d112560 SHA1 6b9a31df3f2ceaaa413ba06d55b865f0149426b0 SHA256 e9295d57260f7c1b063175197770c3e0a42f1a09ec339c2aee056e50aff31811
 EBUILD amarok-1.4.10-r2.ebuild 3122 RMD160 090b3339a6af25c617c85edefb681f2944a4ec89 SHA1 6d71e3514e7ca64be208e60424be1f20a933b8c2 SHA256 58ffd9bb7d4cd623d1d8ea3bbe1c98f8dea6d29d661048f2a803f310af2cc932
-EBUILD amarok-1.4.10.ebuild 3030 RMD160 2e72e10285e8d56932740ca1ac2f2805c9be46aa SHA1 449b3a6bb442d1cd9565fa197d2889d447af8156 SHA256 29b55d449f20700ae756b6deddea68b38f3e1bd262374f665e9018aaa18cfe43
-EBUILD amarok-1.4.10_p20090130-r1.ebuild 3061 RMD160 8bc91dc1579270f4d6f6acbf071bdf5f9c406747 SHA1 8e0ce1baafa05af31e9f0d34028a361381c9d41b SHA256 2d585d730ad84f43d8a8895347c1a0a90372544244bb86a3eb6856fab73cf59b
-EBUILD amarok-1.4.10_p20090130.ebuild 3004 RMD160 af33d54c5b8b99c35c65cae3446b5603d2578b6e SHA1 6c324ac91e3bf1e0e6546fca2ea9df648f69e280 SHA256 5b9b44d340ae9b1a5f5e6b8bf2d04ace3bf69100b545c2416d35f4138e5f28fa
-EBUILD amarok-1.4.8.ebuild 3195 RMD160 ae0a14b0ab7ecaed2de15710bbb8ca7127e4cbc8 SHA1 25a2eb100c29203cb3713e66bf25e5bb2c6d2a4a SHA256 1d56cc2d878de0e7d9afd2c89163a0f221f3c56e3f9c3725d3fe8884a30c19c8
-EBUILD amarok-1.4.9.1-r1.ebuild 3069 RMD160 410163fa1d2049988d3f00c7c86a9eb70b2f1013 SHA1 069b89e7f2320c5280b2862f7bd301a59a9ca7c1 SHA256 173d1a12c7f4d482b173a88d841ae66418fde82854de89cf723775d8b2f05642
-EBUILD amarok-1.4.9.1.ebuild 3016 RMD160 0e525e2ee81f4394ab4989dcca5e3d6d55caa606 SHA1 33474fdd4b643a11d50ec65ebeaebe765ce166a3 SHA256 70c548c4a9c362a682bc25021f818df72622918fcfc57d6ce3f3529af3745fbe
-EBUILD amarok-1.4.9999-r2.ebuild 2968 RMD160 ccdac64d981d96b28355906009cd37fb89ce36b0 SHA1 8530f914a80ac7d988981f996ebcb09055017995 SHA256 f3d3a1311d4614ce983e984fd6b589fcf5027fcb16b47234646b7eb2814e5941
-EBUILD amarok-2.0.1.1.ebuild 2823 RMD160 2198407ef7e17f8b42d94d2a4e8741535b65b635 SHA1 7efd5752f9b9295b6a8a0410aeb6465053d4cedc SHA256 478c852b28b19b4b23d4da542bd499353028a0e146bb8c72f6af45e94ca3a7bc
-MISC ChangeLog 50162 RMD160 9986c85e13b42ddb92b818c53bc9894039270355 SHA1 716d150ed6f85b9f78c0d4c481a6c738278666ee SHA256 ff2aaf656ef98d13d382bbde1e7acf5a12c2d4129245f3de6c5c23a7df2657cf
-MISC metadata.xml 2064 RMD160 849eb1d1290373e6c223f9989aad0c637a837abd SHA1 5053b1488abf172eeec9cd11450dedb4479731d3 SHA256 ad95aa33cd1d6bcfa5f8621c159c9a1a5b1dfa2872d9c779b1dfdcd46af4fab4
+EBUILD amarok-1.4.10-r3.ebuild 3226 RMD160 38303bdfe9ad65d6861379e51bddfc598f719e60 SHA1 a2f550c116ef3ee20b62ff0b0ee579e04ea0a997 SHA256 61aad4673e25198ce540f657abf4eefce408fb510947626737622254794c048f
+EBUILD amarok-1.4.10_p20090130-r1.ebuild 3162 RMD160 eabc96bcd8afa372998649a41333af2601703656 SHA1 c6f4cbff0a8c5637ec5f4b692054a7bc57092d95 SHA256 1ab85e6ac5a66938045dfda98214d2f3c015725603bc0e12d7f1496bf43564ed
+EBUILD amarok-2.0.1.1.ebuild 2318 RMD160 b87f86fad0f1064629a4f9187e618a1215856598 SHA1 f93ebfd298b97597e81bb47c55ad50a9d633abe6 SHA256 9f5497169f33b796d9d40d570a58a426354f11aea52bf496341df94283736296
+MISC ChangeLog 50785 RMD160 4875f89e3de3b1809cb3144481e3f4c779b8c38f SHA1 f9dfd4ddfa6dbad03965ec6b4ffc27154993ee15 SHA256 42f0dc19777a124970012be16d3d3cec8997292d40f8ce87d707fff35eef739e
+MISC metadata.xml 2137 RMD160 03413e0dd8cb62b3459521db47ac3f5fb8707f13 SHA1 d1abfe090a2b5aa780a888c0cf339e8974511d9d SHA256 1c4b648744b598443d76b3bc21dae87dd8fa4f7e0fda2645aa3ec77c0cda7a93
diff --git a/media-sound/amarok/amarok-1.4.10-r1.ebuild b/media-sound/amarok/amarok-1.4.10-r3.ebuild
index 3bd355c1c518..d28363c7a6a5 100644
--- a/media-sound/amarok/amarok-1.4.10-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.10-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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-1.4.10-r1.ebuild,v 1.2 2008/08/31 20:07:45 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10-r3.ebuild,v 1.1 2009/04/14 03:05:15 jmbsvicetto Exp $
 
 ARTS_REQUIRED="never"
 
@@ -43,53 +43,71 @@ visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
 
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+# Blocking amarok:2 until the KDE3 eclasses are updated
+# to move misc apps to /usr/kde/3.5
+RDEPEND="
+	!>=media-sound/amarok-2.0.0
+	=dev-lang/ruby-1.8*
 	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	kde? (
+		|| (
+			=kde-base/kdebase-3.5*
+			=kde-base/konqueror-3.5*
+		)
+	)
+	ifp? ( media-libs/libifp )
 	ipod? ( >=media-libs/libgpod-0.5.2 )
 	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? (
-		media-video/realplayer
-		media-libs/alsa-lib )
-	njb? ( >=media-libs/libnjb-2.2.4 )
 	mtp? ( >=media-libs/libmtp-0.3.0 )
 	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
+	mysql? ( >=virtual/mysql-4.0 )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	opengl? ( virtual/opengl )
+	postgres? ( virtual/postgresql-base )
+	real? (
+		media-libs/alsa-lib
+		media-video/realplayer
+	)
+	visualization? (
+		media-libs/libsdl
+		=media-plugins/libvisual-plugins-0.4*
+	)
+"
 
 DEPEND="${RDEPEND}"
 
 RDEPEND="${RDEPEND}
 	app-arch/unzip
+	daap? ( www-servers/mongrel )
 	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
+"
 
 PATCHES=( "${FILESDIR}/amarok-1.4.9.1-libmtp-0.3.0-API.patch"
-	"${FILESDIR}/${P}-gcc-4.3.patch" )
+	"${FILESDIR}/${P}-gcc-4.3.patch"
+	"${FILESDIR}/${P}-audibletag.patch" )
 
 need-kde 3.5
 
 src_compile() {
 	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl)
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-nmm"
+	local myconf="
+		$(use_enable amazon)
+		$(use_enable mysql)
+		$(use_enable postgres postgresql)
+		$(use_with daap)
+		$(use_with ifp)
+		$(use_with ipod libgpod)
+		$(use_with mp4 mp4v2)
+		$(use_with mtp libmtp)
+		$(use_with musicbrainz)
+		$(use_with njb libnjb)
+		$(use_with opengl)
+		$(use_with real helix)
+		$(use_with visualization libvisual)
+		--with-xine
+		--without-nm
+	"
 
 	kde_src_compile
 }
diff --git a/media-sound/amarok/amarok-1.4.10.ebuild b/media-sound/amarok/amarok-1.4.10.ebuild
deleted file mode 100644
index 8e9515bcafcf..000000000000
--- a/media-sound/amarok/amarok-1.4.10.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10.ebuild,v 1.8 2008/08/31 20:07:46 loki_val Exp $
-
-ARTS_REQUIRED="never"
-
-LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
-fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
-pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
-zh_CN zh_TW"
-
-LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde
-
-PKG_SUFFIX=""
-
-if [[ ${P/_pre} == ${P} ]]; then
-	MY_P="${P/_/-}"
-
-	if [[ ${P/_rc} == ${P} ]]; then
-		SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_rc*}"
-	fi
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mp4 kde mysql amazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz daap
-python"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.5.2 )
-	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? (
-		media-video/realplayer
-		media-libs/alsa-lib )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( <media-libs/libmtp-0.3.0 )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	app-arch/unzip
-	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-4.3.patch" )
-
-need-kde 3.5
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl)
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
-	# from Portage, for security and policy reasons.
-	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
-		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
-		"${D}"/usr/$(get_libdir)/ruby_lib
-
-	if ! use python; then
-		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
-			|| die "Unable to remove webcontrol."
-	fi
-}
diff --git a/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild
index f00d7daf5d79..d4439e140fc2 100644
--- a/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-1.4.10_p20090130-r1.ebuild,v 1.1 2009/01/30 15:35:30 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.10_p20090130-r1.ebuild,v 1.2 2009/04/14 03:05:15 jmbsvicetto Exp $
 
 ARTS_REQUIRED="never"
 
@@ -35,31 +35,45 @@ visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
 
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+# Blocking amarok:2 until the KDE3 eclasses are updated
+# to move misc apps to /usr/kde/3.5
+RDEPEND="
+	!>=media-sound/amarok-2.0.0
+	=dev-lang/ruby-1.8*
 	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
+	>=media-libs/xine-lib-1.1.2_pre20060328-r8
+	ifp? ( media-libs/libifp )
 	ipod? ( >=media-libs/libgpod-0.5.2 )
+	kde? (
+		|| (
+			=kde-base/kdebase-3.5*
+			=kde-base/konqueror-3.5*
+		)
+	)
 	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? (
-		media-video/realplayer
-		media-libs/alsa-lib )
-	njb? ( >=media-libs/libnjb-2.2.4 )
 	mtp? ( >=media-libs/libmtp-0.3.0 )
 	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
+	mysql? ( >=virtual/mysql-4.0 )
+	njb? ( >=media-libs/libnjb-2.2.4 )
+	opengl? ( virtual/opengl )
+	postgres? ( virtual/postgresql-base )
+	real? (
+		media-libs/alsa-lib
+		media-video/realplayer
+	)
+	visualization? (
+		media-libs/libsdl
+		=media-plugins/libvisual-plugins-0.4*
+	)
+"
 
 DEPEND="${RDEPEND}"
 
 RDEPEND="${RDEPEND}
 	app-arch/unzip
+	daap? ( www-servers/mongrel )
 	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
+"
 
 PATCHES=( "${FILESDIR}/amarok-1.4.9.1-libmtp-0.3.0-API.patch"
 	"${FILESDIR}/amarok-1.4.10-gcc-4.3.patch"
@@ -70,20 +84,23 @@ need-kde 3.5
 
 src_compile() {
 	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl)
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-nmm"
+	local myconf="
+		$(use_enable amazon)
+		$(use_enable mysql)
+		$(use_enable postgres postgresql)
+		$(use_with daap)
+		$(use_with ifp)
+		$(use_with ipod libgpod)
+		$(use_with mp4 mp4v2)
+		$(use_with mtp libmtp)
+		$(use_with musicbrainz)
+		$(use_with njb libnjb)
+		$(use_with opengl)
+		$(use_with real helix)
+		$(use_with visualization libvisual)
+		--with-xine
+		--without-nmm
+	"
 
 	kde_src_compile
 }
diff --git a/media-sound/amarok/amarok-1.4.10_p20090130.ebuild b/media-sound/amarok/amarok-1.4.10_p20090130.ebuild
deleted file mode 100644
index 2b35efccdac7..000000000000
--- a/media-sound/amarok/amarok-1.4.10_p20090130.ebuild
+++ /dev/null
@@ -1,105 +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-1.4.10_p20090130.ebuild,v 1.1 2009/01/30 15:35:30 carlo Exp $
-
-ARTS_REQUIRED="never"
-
-LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
-fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
-pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
-zh_CN zh_TW"
-
-LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde
-
-PKG_SUFFIX=""
-
-MY_P="${P/_*/}"
-S="${WORKDIR}/${MY_P}"
-
-SRC_URI="mirror://kde/stable/amarok/${PV/_*/}/src/${MY_P}.tar.bz2
-	mirror://gentoo/amarok-1.4.10-post20090130.diff.tar.bz2"
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="mp4 kde mysql amazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz daap
-python"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.5.2 )
-	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? (
-		media-video/realplayer
-		media-libs/alsa-lib )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( <media-libs/libmtp-0.3.0 )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	app-arch/unzip
-	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
-
-PATCHES=( "${FILESDIR}/amarok-1.4.10-gcc-4.3.patch"
-	"${WORKDIR}/amarok-1.4.10-post20090130.diff"
-	"${WORKDIR}/amarok-1.4.10-desktop-entry.diff" )
-
-need-kde 3.5
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl)
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
-	# from Portage, for security and policy reasons.
-	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
-		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
-		"${D}"/usr/$(get_libdir)/ruby_lib
-
-	if ! use python; then
-		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
-			|| die "Unable to remove webcontrol."
-	fi
-}
diff --git a/media-sound/amarok/amarok-1.4.8.ebuild b/media-sound/amarok/amarok-1.4.8.ebuild
deleted file mode 100644
index 0851ecde7600..000000000000
--- a/media-sound/amarok/amarok-1.4.8.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.8.ebuild,v 1.10 2008/05/19 20:07:29 dev-zero Exp $
-
-LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
-fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
-pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
-zh_CN zh_TW"
-
-LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde
-
-PKG_SUFFIX=""
-
-if [[ ${P/_pre} == ${P} ]]; then
-	MY_P="${P/_/-}"
-
-	if [[ ${P/_rc} == ${P} ]]; then
-		SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_rc*}"
-	fi
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mp4 kde mysql opengl postgres
-visualization ipod ifp real njb mtp musicbrainz daap
-python"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.5.2 )
-	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? ( media-video/realplayer )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( >=media-libs/libmtp-0.1.1 )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	app-arch/unzip
-	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
-
-need-kde 3.3
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) --without-xmms
-				  $(use_with visualization libvisual)
-				  --disable-amazon
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-mas
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
-	# from Portage, for security and policy reasons.
-	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
-		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
-		"${D}"/usr/$(get_libdir)/ruby_lib
-
-	if ! use python; then
-		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
-			|| die "Unable to remove webcontrol."
-	fi
-}
-
-pkg_postinst() {
-	elog "Amazon cover fetching has been disabled in this Amarok version."
-	elog "This is due to a change in Amazon's protocol. If you want Amazon"
-	elog "cover fetching, please use at least Amarok version 1.4.9.1."
-}
diff --git a/media-sound/amarok/amarok-1.4.9.1-r1.ebuild b/media-sound/amarok/amarok-1.4.9.1-r1.ebuild
deleted file mode 100644
index dfe800a7ec43..000000000000
--- a/media-sound/amarok/amarok-1.4.9.1-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9.1-r1.ebuild,v 1.2 2008/07/07 14:23:52 flameeyes Exp $
-
-LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
-fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
-pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
-zh_CN zh_TW"
-
-LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde
-
-PKG_SUFFIX=""
-
-if [[ ${P/_pre} == ${P} ]]; then
-	MY_P="${P/_/-}"
-
-	if [[ ${P/_rc} == ${P} ]]; then
-		SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_rc*}"
-	fi
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="mp4 kde mysql amazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz daap
-python"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.5.2 )
-	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? (
-		media-video/realplayer
-		media-libs/alsa-lib )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( >=media-libs/libmtp-0.3.0 )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	app-arch/unzip
-	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
-
-PATCHES=( 	"${FILESDIR}/${P}-helix+gcc-4.3.patch"
-		"${FILESDIR}/${P}-libmtp-0.3.0-API.patch" )
-
-need-kde 3.3
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl)
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
-	# from Portage, for security and policy reasons.
-	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
-		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
-		"${D}"/usr/$(get_libdir)/ruby_lib
-
-	if ! use python; then
-		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
-			|| die "Unable to remove webcontrol."
-	fi
-}
diff --git a/media-sound/amarok/amarok-1.4.9.1.ebuild b/media-sound/amarok/amarok-1.4.9.1.ebuild
deleted file mode 100644
index 564cf12da8c7..000000000000
--- a/media-sound/amarok/amarok-1.4.9.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9.1.ebuild,v 1.11 2008/07/17 18:58:00 corsair Exp $
-
-LANGS="af ar az be bg bn br ca cs cy da de el en_GB eo es et eu fa fi
-fr ga gl he hi hu id is it ja km ko ku lo lt mk ms nb nds ne nl nn pa
-pl pt pt_BR ro ru rw se sk sl sq sr sr@Latn ss sv ta tg th tr uk uz
-zh_CN zh_TW"
-
-LANGS_DOC="da de es et fr it nl pl pt pt_BR ru sv"
-
-USE_KEG_PACKAGING=1
-
-inherit kde
-
-PKG_SUFFIX=""
-
-if [[ ${P/_pre} == ${P} ]]; then
-	MY_P="${P/_/-}"
-
-	if [[ ${P/_rc} == ${P} ]]; then
-		SRC_URI="mirror://kde/stable/amarok/${PV}/src/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_/-}"
-	else
-		SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-		S="${WORKDIR}/${P/_rc*}"
-	fi
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-fi
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mp4 kde mysql amazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz daap
-python"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.5.2 )
-	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? (
-		media-video/realplayer
-		media-libs/alsa-lib )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( <=media-libs/libmtp-0.3.0 )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	app-arch/unzip
-	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-helix+gcc-4.3.patch
-)
-
-need-kde 3.3
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl)
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
-	# from Portage, for security and policy reasons.
-	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
-		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
-		"${D}"/usr/$(get_libdir)/ruby_lib
-
-	if ! use python; then
-		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
-			|| die "Unable to remove webcontrol."
-	fi
-}
diff --git a/media-sound/amarok/amarok-1.4.9999-r2.ebuild b/media-sound/amarok/amarok-1.4.9999-r2.ebuild
deleted file mode 100644
index 4f35ba93b93c..000000000000
--- a/media-sound/amarok/amarok-1.4.9999-r2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9999-r2.ebuild,v 1.5 2008/05/19 20:07:29 dev-zero Exp $
-
-inherit kde subversion
-
-ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/branches/stable/extragear/multimedia/amarok"
-ESVN_STORE_DIR="${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}/svn-src/"
-
-PKG_SUFFIX=""
-
-DESCRIPTION="Advanced audio player based on KDE framework."
-HOMEPAGE="http://amarok.kde.org/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS=""
-IUSE="mp4 kde mysql amazon opengl postgres
-visualization ipod ifp real njb mtp musicbrainz daap
-python"
-# kde: enables compilation of the konqueror sidebar plugin
-
-RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
-	>=media-libs/xine-lib-1.1.2_pre20060328-r8
-	>=media-libs/taglib-1.4
-	mysql? ( >=virtual/mysql-4.0 )
-	postgres? ( virtual/postgresql-base )
-	opengl? ( virtual/opengl )
-	visualization? ( media-libs/libsdl
-		=media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.5.2 )
-	mp4? ( media-libs/libmp4v2 )
-	ifp? ( media-libs/libifp )
-	real? (
-		media-video/realplayer
-		media-libs/alsa-lib )
-	njb? ( >=media-libs/libnjb-2.2.4 )
-	mtp? ( >=media-libs/libmtp-0.1.1 )
-	musicbrainz? ( media-libs/tunepimp )
-	=dev-lang/ruby-1.8*"
-
-DEPEND="${RDEPEND}"
-
-RDEPEND="${RDEPEND}
-	app-arch/unzip
-	python? ( dev-python/PyQt )
-	daap? ( www-servers/mongrel )"
-
-need-kde 3.3
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	ESVN_UPDATE_CMD="svn update -N" \
-	ESVN_FETCH_CMD="svn checkout -N" \
-	ESVN_REPO_URI=`dirname ${ESVN_REPO_URI}` \
-		subversion_src_unpack
-
-	S="${WORKDIR}/${PN}/admin" \
-	ESVN_REPO_URI="svn://anonsvn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin" \
-		subversion_src_unpack
-
-	ESVN_UPDATE_CMD="svn up" \
-	ESVN_FETCH_CMD="svn checkout" \
-	S="${WORKDIR}/${PN}/amarok" \
-		subversion_src_unpack
-}
-
-src_compile() {
-	# Extra, unsupported engines are forcefully disabled.
-	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
-				  $(use_with opengl) --without-xmms
-				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
-				  $(use_with ipod libgpod)
-				  $(use_with mp4 mp4v2)
-				  $(use_with ifp)
-				  $(use_with real helix)
-				  $(use_with njb libnjb)
-				  $(use_with mtp libmtp)
-				  $(use_with musicbrainz)
-				  $(use_with daap)
-				  --with-xine
-				  --without-mas
-				  --without-nmm"
-
-	kde_src_compile
-}
-
-src_install() {
-	kde_src_install
-
-	# As much as I respect Ian, I'd rather leave Amarok to use mongrel
-	# from Portage, for security and policy reasons.
-	rm -rf "${D}"/usr/share/apps/amarok/ruby_lib/rbconfig \
-		"${D}"/usr/share/apps/amarok/ruby_lib/mongrel* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/rubygems* \
-		"${D}"/usr/share/apps/amarok/ruby_lib/gem* \
-		"${D}"/usr/$(get_libdir)/ruby_lib
-
-	if ! use python; then
-		rm -r "${D}"/usr/share/apps/amarok/scripts/webcontrol \
-			|| die "Unable to remove webcontrol."
-	fi
-}
diff --git a/media-sound/amarok/amarok-2.0.1.1.ebuild b/media-sound/amarok/amarok-2.0.1.1.ebuild
index 238b73ad617f..e8c1e6b3e237 100644
--- a/media-sound/amarok/amarok-2.0.1.1.ebuild
+++ b/media-sound/amarok/amarok-2.0.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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.1.1.ebuild,v 1.12 2009/03/16 10:24:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.1.1.ebuild,v 1.13 2009/04/14 03:05:15 jmbsvicetto Exp $
 
 EAPI="2"
 
@@ -19,15 +19,19 @@ SLOT="2"
 IUSE="daap debug ifp ipod mp3tunes mp4 mtp njb +semantic-desktop"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 
-DEPEND=">=app-misc/strigi-0.5.7
+# Blocking amarok:0 until the KDE3 eclasses are updated
+# to move misc apps to /usr/kde/3.5
+DEPEND="
+	!media-sound/amarok:0
+	>=app-misc/strigi-0.5.7
 	|| (
 		>=dev-db/mysql-5.0[embedded,-minimal]
 		>=dev-db/mysql-community-5.0[embedded,-minimal]
 	)
-	>=media-libs/taglib-1.5
-	|| ( media-sound/phonon x11-libs/qt-phonon:4 )
 	>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
 	>=kde-base/plasma-workspace-${KDE_MINIMAL}
+	>=media-libs/taglib-1.5
+	|| ( media-sound/phonon x11-libs/qt-phonon:4 )
 	x11-libs/qt-webkit:4
 	ifp? ( media-libs/libifp )
 	ipod? ( >=media-libs/libgpod-0.7.0 )
@@ -44,27 +48,11 @@ DEPEND=">=app-misc/strigi-0.5.7
 
 RDEPEND="${DEPEND}
 	app-arch/unzip
-	daap? ( www-servers/mongrel )"
+	daap? ( www-servers/mongrel )
+"
 
 PATCHES=( "${FILESDIR}/${PV}-ipod.patch" )
 
-pkg_setup() {
-	if use amd64 ; then
-		ewarn
-		ewarn "Compilation will fail if dev-db/mysql[-community] is built without -fPIC in your CFLAGS!"
-		ewarn "Related bug: http://bugs.gentoo.org/show_bug.cgi?id=238487"
-		ewarn
-		ewarn "To fix this, and to avoid using -fPIC globally in your make.conf	(which is not recommended),"
-		ewarn "put the following into /etc/portage/env/dev-db/mysql (or	mysql-community, depending on which you use;"
-		ewarn "create dirs and the file if they don't exist):"
-		ewarn
-		ewarn "CFLAGS=\"${CFLAGS} -DPIC -fPIC\""
-		ewarn "CXXFLAGS=\"${CXXFLAGS} -DPIC -fPIC\""
-		ewarn
-	fi
-	kde4-base_pkg_setup
-}
-
 src_configure() {
 	if use debug; then
 		mycmakeargs="${mycmakeargs} -DCMAKE_BUILD_TYPE=debugfull"
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index 954ce7b839fd..71895f132c7e 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -3,6 +3,9 @@
 <pkgmetadata>
   <herd>kde</herd>
   <herd>sound</herd>
+  <maintainer>
+    <email>jmbsvicetto@gentoo.org</email>
+  </maintainer>
   <use>
     <flag name="amazon">Enable support for downloading covers from amazon.com</flag>
     <flag name="daap">