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.

Package-Manager: portage-2.1.5_rc2

4 files changed, 34 insertions, 22 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/Manifest b/media-sound/amarok/Manifest
index 6877c40dfd56..8dc37a19a987 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX amarok-1.4.7+xine-lib-1.1.8-lastfm.patch 808 RMD160 fcf33e066734fdf14b5b25421093f19282b2f130 SHA1 bf38186111297dc9da5eb00be14ba9772d2ae134 SHA256 5c65d14d2aa8b6739a7a8493f7d4db808c25d56047ff00b7adcd8754ee97e4f2
 AUX amarok-1.4.7-svn148317.patch 538 RMD160 088c06869d98f2bc9de83a8e9e39d0026bc74db1 SHA1 f66e14a0273e68caf9ceb40b8475d35c32bc04e5 SHA256 f159099ec72687ad306c4d386336f0864b4510d5c5b09026cd31401c3ade23ae
-DIST amarok-1.4.7.tar.bz2 12723499 RMD160 fc5f5182b488f629cc608aee16aa84a0c4978dcd SHA1 ff97ad833159f4be32c0dfe546a6dee944f5339d SHA256 7ef2691d0cda238696e021421052a04b3cfb068ea0d9854e0c617b33216340f8
 DIST amarok-1.4.8.tar.bz2 12699378 RMD160 b557f6f5f14c304ae82c8d5537263ecc1faa922e SHA1 8051efa40483271fe6b7d229da9b4d7af3142348 SHA256 12877e60dc5a362e37dc4c775cc809ce8e5a15c13211902f6a821f238a45aae5
-EBUILD amarok-1.4.7-r2.ebuild 3055 RMD160 e2ffc8921435fe92e2a18f7d3a60a579b0cf0984 SHA1 e5b7f1f706319d4b8a41d23d4436cfab3c36e703 SHA256 14155840c410c5e8b1b865dab12b0635efe52eaa89a55bab45d2be78a60fd252
-EBUILD amarok-1.4.8.ebuild 2959 RMD160 e82df6e4b3bb58c2f39cb95f6af780af8695cfba SHA1 95c1145bcf29d98029e34aee175afea36c3ab360 SHA256 f6d2c94ce55d5a041f5c7c7c44190a5550d8cd58cba8096253096c1e5da95dfb
+DIST amarok-1.4.9.1.tar.bz2 12707926 RMD160 9f6e59116292bd33e10c0245bfdbd3a2df319765 SHA1 5473c7d578a4bf2662f977d9239ff0066ee8f159 SHA256 c4a02c3267cd5f3a9ff9efa066f1e0308c2cd903be2d5b24e3d9f75abdc1fa93
+EBUILD amarok-1.4.8.ebuild 3184 RMD160 cb16af4851f7628e163f9cd3da05ae882d28230c SHA1 053834cdca3d78bcb4e1818085018d2cea33eac6 SHA256 fe6b437a7dceb82f5b2ded61ff7640bdeb214095c7693c9337bb10b9520d2393
+EBUILD amarok-1.4.9.1.ebuild 2969 RMD160 a99832bfe63b8e3238f28b47623e7a878f9c0750 SHA1 f4ce730ec7c3344b8d36463ac518f0cbc5643b81 SHA256 18a00f5ea93012e663f73df51de2caf2e86bd3bf7a54af8679d4ab3b794985b5
 EBUILD amarok-1.4.9999-r2.ebuild 2931 RMD160 d6113b18d9d155cce22ae05ea57170205cbe646d SHA1 391579d2cf53817388d4479d798b46c2a0e6c711 SHA256 3b8ff889958eaa123f49e318fc49cf485b6c386441408b9e6ddd5bfca915ba6b
-MISC ChangeLog 42448 RMD160 509822f264ee734ba68a8e87a5aa648be3b5aeff SHA1 089c2159ba2983b605fcd15b54cf7874d3d53ac3 SHA256 0377fb62606ef6b9b2b61d03e19c607a214dc748721ff21cce1fab6fde00235b
+MISC ChangeLog 42798 RMD160 9be323b6b3698e65620ecd2e0c60060324b4fbcd SHA1 ad9dcbae7c4e5037047c757413047166e957cf7e SHA256 06780e89cf7bb3f3a3ed49665b89e56d7ef233ceb864fc1d323e15da9c6d1533
 MISC metadata.xml 1637 RMD160 a096386a6b2e869b5318391a569c331175f37964 SHA1 bdc2853b3976d8e7e25991dc041ef3acd50a1ad7 SHA256 297e4f01b63287c80d57c5ca4604fd684bb593c688a59461496484af7e6ea848
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHujYeB18eXLOpYdkRAou/AKCO0rEtO27IY0jVc0MyTWXKuuS/+gCgl7Un
-y4BrctCtWUbvfIOpvBqy4vM=
-=WNq3
+iEYEARECAAYFAkf+mLIACgkQAiZjviIA2Xh5KwCfaAydiEYOB0nUOqubi9T74z3r
+hVIAn2OBU2n7J+CIIrJ0/wE261k/kTi4
+=DFZg
 -----END PGP SIGNATURE-----
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() {