Fix the patch, use the proper one.

Package-Manager: portage-2.1.2-r9

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 4f7d4540d69e2aab931e542782f640ecf105d14d..48485b30f7a7762ae8fc6961de0ae10ec8873610 100644 (file)
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.206 2007/02/14 20:34:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.207 2007/02/14 20:38:16 flameeyes Exp $
+
+  14 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
+  files/amarok-1.4.5-magnatune.patch:
+  Fix the patch, use the proper one.
 
 *amarok-1.4.5-r1 (14 Feb 2007)
 

diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index ce34b7a88afc693336095135edfb4d63fb267d06..42c6c8a6c43e5e4b6221685e2a2f010a2090f7f9 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -5,10 +5,10 @@ AUX amarok-1.4.4+libgpod-0.4.0.patch 2738 RMD160 2e6a44eabe8691c209a3beba5764fa9
 MD5 2b0195629a6a2b52f22db726bc59cd2f files/amarok-1.4.4+libgpod-0.4.0.patch 2738
 RMD160 2e6a44eabe8691c209a3beba5764fa9ca59aa43c files/amarok-1.4.4+libgpod-0.4.0.patch 2738
 SHA256 8def3879b8adb5e2e32d4b4f724d4dd2d896791f6cbe99d5fffcb3f128b26b26 files/amarok-1.4.4+libgpod-0.4.0.patch 2738
-AUX amarok-1.4.5-magnatune.patch 813 RMD160 248468df00bcfd14bb9b387880b6b6090586ef84 SHA1 acad6c59634d4b3e0e4480f1f196b2fb59213901 SHA256 dd76b63f7c5a5a93f00190bb927c01ad5dcfe1b235a72df437b1edc6d175f20c
-MD5 5c609c757ec57fb2a6f4f03d8d74cd60 files/amarok-1.4.5-magnatune.patch 813
-RMD160 248468df00bcfd14bb9b387880b6b6090586ef84 files/amarok-1.4.5-magnatune.patch 813
-SHA256 dd76b63f7c5a5a93f00190bb927c01ad5dcfe1b235a72df437b1edc6d175f20c files/amarok-1.4.5-magnatune.patch 813
+AUX amarok-1.4.5-magnatune.patch 873 RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b SHA1 aacd742d79b91d19ab68edd5a38d1dd08459c7b9 SHA256 96848937bffca80b2e9eb338e4581b7600ee2957f26a32291b5337fffb04cfb9
+MD5 7a108e4a750077b5bd606cb4dd6947ee files/amarok-1.4.5-magnatune.patch 873
+RMD160 f9d68fce79b228c8eb894442a95447dbaec0179b files/amarok-1.4.5-magnatune.patch 873
+SHA256 96848937bffca80b2e9eb338e4581b7600ee2957f26a32291b5337fffb04cfb9 files/amarok-1.4.5-magnatune.patch 873
 DIST amarok-1.4.4-gentoo.tar.bz2 2830 RMD160 75c42ba3bab6aa363aa71bfd17d9532555abc040 SHA1 0a9bb86e197f4af47e17a4aaa5cb82eb4850b49d SHA256 d874db4cd1b63084df4c20b26ef461e95c242579c4d6e4ca80ccff046d149b33
 DIST amarok-1.4.4.tar.bz2 17635707 RMD160 61cd2748ce0111f4ba388a71e9504abb7362b0d7 SHA1 932ab971407172a86746e473a1d1cf6871aea93c SHA256 760d30337cb73c86b9298e5c2c9836b3a753c39805b54f75b1eea82c15e9a0ea
 DIST amarok-1.4.5.tar.bz2 18034110 RMD160 c2bbfe06f3e613dfc7d3926d086024073390c712 SHA1 882dec8d30c10f609a1f5e21d2e91342e78304c5 SHA256 45aa7cafe2a46dd988cd5034ae19da988926eecb2ac90d3e6912c57e558108c8
@@ -24,10 +24,10 @@ EBUILD amarok-9999-r1.ebuild 2753 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9
 MD5 c116c2eb572ee0f17dc0028e1f26598e amarok-9999-r1.ebuild 2753
 RMD160 eeb8c4016feb305a447c7757e292a0ef21ae2c9b amarok-9999-r1.ebuild 2753
 SHA256 e9876a6ba0782965217a86820b8536bd6537673d2dc36b27e4515b5e6d303f7e amarok-9999-r1.ebuild 2753
-MISC ChangeLog 34283 RMD160 564b8b1644095af3d1b4bddca524cf1fab758664 SHA1 bbeea2940e9a158873150b0eeaa3db52f7a1695b SHA256 8b943412dccd386bbd311f198deb2eb54f37083072ed100b320738c2bc0c6c40
-MD5 5ca3a7cf9eca5a5c7232ee7295a9ef1e ChangeLog 34283
-RMD160 564b8b1644095af3d1b4bddca524cf1fab758664 ChangeLog 34283
-SHA256 8b943412dccd386bbd311f198deb2eb54f37083072ed100b320738c2bc0c6c40 ChangeLog 34283
+MISC ChangeLog 34412 RMD160 d3fd0e87c721b49c3a4970e446ff224464d3f0d3 SHA1 26b11d5ab3d7421adc2765ff90e51f56a616a33c SHA256 d8e6d89391968674a7229d278f5c5b51ed1b12add0d61f94dd89d561833acf88
+MD5 0a47bf4524e0cc410bb11a748317facc ChangeLog 34412
+RMD160 d3fd0e87c721b49c3a4970e446ff224464d3f0d3 ChangeLog 34412
+SHA256 d8e6d89391968674a7229d278f5c5b51ed1b12add0d61f94dd89d561833acf88 ChangeLog 34412
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -44,7 +44,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF03JkAiZjviIA2XgRAuDBAKC7elFG8i7XSIJ/ib3vAvEEDTTGVwCdFYVZ
-I93gflSGp+T6DDWoX+FsD2I=
-=SHyl
+iD8DBQFF03M/AiZjviIA2XgRArBpAJ486FrsCx9s5uE+mh58P2SeYiZtOQCgoJO2
+PakTiFDeSxGtKR1byRKVcFU=
+=l8VS
 -----END PGP SIGNATURE-----

diff --git a/media-sound/amarok/files/amarok-1.4.5-magnatune.patch b/media-sound/amarok/files/amarok-1.4.5-magnatune.patch
index a4890d0e32f5bd4f0a84c6ab5c73e6c2c9ba4e1d..3716fa80e359636241a7c8bf849e7e07de9d1b2b 100644 (file)
--- a/media-sound/amarok/files/amarok-1.4.5-magnatune.patch
+++ b/media-sound/amarok/files/amarok-1.4.5-magnatune.patch
@@ -1,7 +1,7 @@
-Index: src/magnatunebrowser/magnatunealbumdownloader.cpp
+Index: amarok-1.4.5/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp
 ===================================================================
---- src/magnatunebrowser/magnatunealbumdownloader.cpp  (revision 633568)
-+++ src/magnatunebrowser/magnatunealbumdownloader.cpp  (revision 633677)
+--- amarok-1.4.5/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp      (revision 633568)
++++ amarok-1.4.5/amarok/src/magnatunebrowser/magnatunealbumdownloader.cpp      (revision 633677)
 @@ -89,8 +89,8 @@
  
      //ok, now we have the .zip file downloaded. All we need is to unpack it to the desired location and add it to the collection.