Allow using libgpod 0.4 with 1.4.3 version.

Package-Manager: portage-2.1.2_pre3-r6

3 files changed, 24 insertions, 11 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 60d13af38364..18dff14fc326 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.169 2006/10/20 12:29:39 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.170 2006/10/21 17:51:45 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> amarok-1.4.3-r1.ebuild:
+  Allow using libgpod 0.4 with 1.4.3 version.
 
   20 Oct 2006; Simon Stelling <blubb@gentoo.org> amarok-1.4.3-r1.ebuild:
   stable on amd64
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index b2deae96123d..606d1f569e91 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX amarok-1.4.0a-strict-aliasing.patch 435 RMD160 6c3ee58300525889b786b2220a2457d02ac665dd SHA1 5bf970810d683e84e18c8808c2b648e69e4030ab SHA256 72069f37be46abf539b10ab937abe5e3eaf77d5ee973dfdbf203bdb031506cf5
 MD5 6a938d8f94e5b0faeb25349df3416c2f files/amarok-1.4.0a-strict-aliasing.patch 435
 RMD160 6c3ee58300525889b786b2220a2457d02ac665dd files/amarok-1.4.0a-strict-aliasing.patch 435
@@ -17,14 +20,14 @@ EBUILD amarok-1.4.0a-r1.ebuild 2360 RMD160 675f131b6d190a90693ece41f3e2116ac2f6d
 MD5 8872e14a1a31e2897a79a5b661d94bf3 amarok-1.4.0a-r1.ebuild 2360
 RMD160 675f131b6d190a90693ece41f3e2116ac2f6dd78 amarok-1.4.0a-r1.ebuild 2360
 SHA256 3e284e8369fd6d711ca33b76ed157287fbfd3ff1505fd07c499cca3390523193 amarok-1.4.0a-r1.ebuild 2360
-EBUILD amarok-1.4.3-r1.ebuild 2144 RMD160 3e7df853f6106fa6138774da1780a101631782fe SHA1 d8c23194affe2d684ed92f77aa49d9675ae0eb67 SHA256 9a298744d2fff04d360bbc7711c9e2b7f38213707b58ba60bfc947d08c5ec9eb
-MD5 1eee40049892d73d17f0a96c0fb80253 amarok-1.4.3-r1.ebuild 2144
-RMD160 3e7df853f6106fa6138774da1780a101631782fe amarok-1.4.3-r1.ebuild 2144
-SHA256 9a298744d2fff04d360bbc7711c9e2b7f38213707b58ba60bfc947d08c5ec9eb amarok-1.4.3-r1.ebuild 2144
-MISC ChangeLog 27555 RMD160 a1a55077faf52d16ee362b3a351409c7cd59f282 SHA1 c9d4f5a73876a94e1ef7bde55172e5439c9bce21 SHA256 c14666df8d488e953bf0eb35379154e64ebdd468f17f89696ca8aa1e7a6cc61d
-MD5 24600c7751ebd078f4631729caf7ec84 ChangeLog 27555
-RMD160 a1a55077faf52d16ee362b3a351409c7cd59f282 ChangeLog 27555
-SHA256 c14666df8d488e953bf0eb35379154e64ebdd468f17f89696ca8aa1e7a6cc61d ChangeLog 27555
+EBUILD amarok-1.4.3-r1.ebuild 2148 RMD160 d4411a86df824e182b5d32f0ea817a9f887a7450 SHA1 150c28c0af4a958a7d820eb331889374b8db0ce8 SHA256 87b2819457c04e3457b27fb68ecb597efbeaa38fc8de2d605d8b4facc1f9444b
+MD5 296e10810b23e550f4e22387e9cd0d61 amarok-1.4.3-r1.ebuild 2148
+RMD160 d4411a86df824e182b5d32f0ea817a9f887a7450 amarok-1.4.3-r1.ebuild 2148
+SHA256 87b2819457c04e3457b27fb68ecb597efbeaa38fc8de2d605d8b4facc1f9444b amarok-1.4.3-r1.ebuild 2148
+MISC ChangeLog 27683 RMD160 01509c9cd48263f2ddd6b4187e671d9765d17878 SHA1 3862dd5393b3d65edb3b3433ee9c8cfc9654264d SHA256 96657ff9f804014221476157e858fdb181c0c63f1ced430cb3f076eb33cf0988
+MD5 ef6d8a8158edaef78901c83fd0eab7b1 ChangeLog 27683
+RMD160 01509c9cd48263f2ddd6b4187e671d9765d17878 ChangeLog 27683
+SHA256 96657ff9f804014221476157e858fdb181c0c63f1ced430cb3f076eb33cf0988 ChangeLog 27683
 MISC metadata.xml 266 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e SHA1 d41658ffae344562e8579d219bd3f746d4cba624 SHA256 c2f316075bb660460a285a5474235615f5946bb47df6e6f0c9c4de9ed64edf26
 MD5 986cc6d7e9a21474e34336045796ffaa metadata.xml 266
 RMD160 3ce35cecb3927850e61ee5bad2e0e4b210c0df3e metadata.xml 266
@@ -38,3 +41,10 @@ SHA256 f3b9961d6146de70b5f5c181f756e63fd23dbafdf7cfc254108ac7d876b304b2 files/di
 MD5 ecfb45bf9511daa1e0894c64f2ff6112 files/digest-amarok-1.4.3-r1 247
 RMD160 8eb0e628f823ab06d97dab32bc6a1e3476c37871 files/digest-amarok-1.4.3-r1 247
 SHA256 30a763884b75f16b9a733b1eeb468f2316f2b6ae1e7500459463fee5cbd94493 files/digest-amarok-1.4.3-r1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFOl5FAiZjviIA2XgRAso8AJ4gpJ0IcSOLNulROtvsiICLDyzDTgCff4fq
+jTZIjJe/+aq5P3BW5n4YQ4Y=
+=uaKe
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.4.3-r1.ebuild b/media-sound/amarok/amarok-1.4.3-r1.ebuild
index 2a567528c2e7..e130b900aca0 100644
--- a/media-sound/amarok/amarok-1.4.3-r1.ebuild
+++ b/media-sound/amarok/amarok-1.4.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.3-r1.ebuild,v 1.7 2006/10/20 12:29:39 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.4.3-r1.ebuild,v 1.8 2006/10/21 17:51:45 flameeyes Exp $
 
 LANGS="az bg br ca cs cy da de el en_GB es et fi fr ga gl he hi hu is it ja ka
 km ko lt ms nb nl nn pa pl pt pt_BR ro ru rw sl sr sr@Latn sv ta tg th tr uk uz
@@ -37,7 +37,7 @@ DEPEND="kde? ( || ( kde-base/konqueror kde-base/kdebase ) )
 	xmms? ( >=media-sound/xmms-1.2 )
 	visualization? ( media-libs/libsdl
 					 =media-plugins/libvisual-plugins-0.4* )
-	ipod? ( =media-libs/libgpod-0.3* )
+	ipod? ( >=media-libs/libgpod-0.3 )
 	aac? ( media-libs/libmp4v2 )
 	ifp? ( media-libs/libifp )
 	real? ( media-video/realplayer )