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.
(Portage version: 2.2_rc28/cvs/Linux x86_64)

11 files changed, 121 insertions, 738 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/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">