Remove old version, disable Amazon support in 1.4.8 version as the protocol is not working anymore, and add a new pre-release ebuild for 1.4.9.1 that is yet to be officially released.

(Portage version: 2.1.5_rc2)

3 files changed, 26 insertions, 14 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 28815afa4e4f..eafee1d2cff2 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.259 2008/02/19 01:52:19 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.260 2008/04/10 22:46:03 flameeyes Exp $
+
+*amarok-1.4.9.1 (10 Apr 2008)
+
+  10 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+  -amarok-1.4.7-r2.ebuild, amarok-1.4.8.ebuild, +amarok-1.4.9.1.ebuild:
+  Remove old version, disable Amazon support in 1.4.8 version as the
+  protocol is not working anymore, and add a new pre-release ebuild for
+  1.4.9.1 that is yet to be officially released.
 
   19 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org> amarok-1.4.7-r2.ebuild,
   amarok-1.4.8.ebuild, amarok-1.4.9999-r2.ebuild:
diff --git a/media-sound/amarok/amarok-1.4.8.ebuild b/media-sound/amarok/amarok-1.4.8.ebuild
index a9a08efa8f82..0ba3fbb4fd33 100644
--- a/media-sound/amarok/amarok-1.4.8.ebuild
+++ b/media-sound/amarok/amarok-1.4.8.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2008/02/19 01:52:19 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.8.ebuild,v 1.9 2008/04/10 22:46:03 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
@@ -36,7 +36,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="mp4 kde mysql amazon opengl postgres
+IUSE="mp4 kde mysql opengl postgres
 visualization ipod ifp real njb mtp musicbrainz daap
 python"
 # kde: enables compilation of the konqueror sidebar plugin
@@ -72,7 +72,7 @@ src_compile() {
 	local myconf="$(use_enable mysql) $(use_enable postgres postgresql)
 				  $(use_with opengl) --without-xmms
 				  $(use_with visualization libvisual)
-				  $(use_enable amazon)
+				  --disable-amazon
 				  $(use_with ipod libgpod)
 				  $(use_with mp4 mp4v2)
 				  $(use_with ifp)
@@ -104,3 +104,9 @@ src_install() {
 			|| 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.7-r2.ebuild b/media-sound/amarok/amarok-1.4.9.1.ebuild
index 957759aa5e67..46398f41f893 100644
--- a/media-sound/amarok/amarok-1.4.7-r2.ebuild
+++ b/media-sound/amarok/amarok-1.4.9.1.ebuild
@@ -1,11 +1,12 @@
 # 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.7-r2.ebuild,v 1.8 2008/02/19 01:52:19 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.9.1.ebuild,v 1.1 2008/04/10 22:46:03 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"
+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
@@ -34,7 +35,7 @@ HOMEPAGE="http://amarok.kde.org/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="mp4 kde mysql amazon opengl postgres
 visualization ipod ifp real njb mtp musicbrainz daap
 python"
@@ -47,8 +48,8 @@ RDEPEND="kde? ( || ( =kde-base/konqueror-3.5* =kde-base/kdebase-3.5* ) )
 	postgres? ( dev-db/libpq )
 	opengl? ( virtual/opengl )
 	visualization? ( media-libs/libsdl
-					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( >=media-libs/libgpod-0.4.2 )
+		=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 )
@@ -64,9 +65,6 @@ RDEPEND="${RDEPEND}
 	python? ( dev-python/PyQt )
 	daap? ( www-servers/mongrel )"
 
-PATCHES="${FILESDIR}/${P}+xine-lib-1.1.8-lastfm.patch
-	${FILESDIR}/${P}-svn148317.patch"
-
 need-kde 3.3
 
 src_compile() {