Depend on 1.1.2 version of flac, as the 1.1.3 version changes API.

Package-Manager: portage-2.1.2_pre3-r5

8 files changed, 56 insertions, 36 deletions

diff --git a/media-libs/sdl-sound/ChangeLog b/media-libs/sdl-sound/ChangeLog
index 4afbe53d9059..aa575a29e593 100644
--- a/media-libs/sdl-sound/ChangeLog
+++ b/media-libs/sdl-sound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/sdl-sound
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/ChangeLog,v 1.21 2006/03/18 16:11:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/ChangeLog,v 1.22 2006/10/19 17:38:05 flameeyes Exp $
+
+  19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> sdl-sound-1.0.1.ebuild,
+  sdl-sound-1.0.1-r1.ebuild, sdl-sound-1.0.1-r2.ebuild:
+  Depend on 1.1.2 version of flac, as the 1.1.3 version changes API.
 
   18 Mar 2006; Markus Rothe <corsair@gentoo.org> sdl-sound-1.0.1-r1.ebuild,
   sdl-sound-1.0.1-r2.ebuild:
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index 43c212be7554..1d2bdfb280ea 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -1,34 +1,44 @@
-AUX gcc331.patch 1235 RMD160 cb0a55cefe5fe7440a77871b5a08ec739d375e91 SHA1 dbaa85d9f14a667a57e8150ed6bfad3afeb7903e SHA256 c904b03821d2d224def0f8a75e0ee7a78d897de69f6027ef9c17ac053bc82640 size 1235
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gcc331.patch 1235 RMD160 cb0a55cefe5fe7440a77871b5a08ec739d375e91 SHA1 dbaa85d9f14a667a57e8150ed6bfad3afeb7903e SHA256 c904b03821d2d224def0f8a75e0ee7a78d897de69f6027ef9c17ac053bc82640
 MD5 8bbc02320ecd20c8a7ed18a63f317ca1 files/gcc331.patch 1235
 RMD160 cb0a55cefe5fe7440a77871b5a08ec739d375e91 files/gcc331.patch 1235
 SHA256 c904b03821d2d224def0f8a75e0ee7a78d897de69f6027ef9c17ac053bc82640 files/gcc331.patch 1235
-DIST SDL_sound-1.0.1.tar.gz 1019056 size 1019056
-EBUILD sdl-sound-1.0.1-r1.ebuild 1162 RMD160 4be8ac82be94851f04388901bcac42edfa24cbb8 SHA1 d5ce36376cd2f0378cdc3f103f8f97064d5afa49 SHA256 e197fc9fbab0b1505c6d320480b6e05e54cad80ae8c4a6d01436b69314569d94 size 1162
-MD5 3442289b6078392fe89e99393b0eecee sdl-sound-1.0.1-r1.ebuild 1162
-RMD160 4be8ac82be94851f04388901bcac42edfa24cbb8 sdl-sound-1.0.1-r1.ebuild 1162
-SHA256 e197fc9fbab0b1505c6d320480b6e05e54cad80ae8c4a6d01436b69314569d94 sdl-sound-1.0.1-r1.ebuild 1162
-EBUILD sdl-sound-1.0.1-r2.ebuild 1589 RMD160 8ee09911330c2806e848eb0b64fa4670446e0b32 SHA1 2632aa0c1a35631f35baa18a5f7a756d5b00c2e2 SHA256 af4f13e0ec2dec20b5374247270255ea87b2c4c37f39eb45904963f4539e67ff size 1589
-MD5 8ca6b6f61763ca017312384375cbdeee sdl-sound-1.0.1-r2.ebuild 1589
-RMD160 8ee09911330c2806e848eb0b64fa4670446e0b32 sdl-sound-1.0.1-r2.ebuild 1589
-SHA256 af4f13e0ec2dec20b5374247270255ea87b2c4c37f39eb45904963f4539e67ff sdl-sound-1.0.1-r2.ebuild 1589
-EBUILD sdl-sound-1.0.1.ebuild 1575 RMD160 43ddf8f38c283520cf38a72e34e777eba61cb87e SHA1 03a60197d5414f7d35bca7b5db0ad51eb23a7a9e SHA256 fd5b79bb9738f2005dd6a6885260f412ed46b2989efce7fa1c92d9b46612ddd5 size 1575
-MD5 1f400d7e01243b805007326495d8fce7 sdl-sound-1.0.1.ebuild 1575
-RMD160 43ddf8f38c283520cf38a72e34e777eba61cb87e sdl-sound-1.0.1.ebuild 1575
-SHA256 fd5b79bb9738f2005dd6a6885260f412ed46b2989efce7fa1c92d9b46612ddd5 sdl-sound-1.0.1.ebuild 1575
-MISC ChangeLog 3331 RMD160 1483144b9e265599be73b2f850ca425ef92c28a5 SHA1 bdeeaf42529bd56af57f45e78b69bbb0a7c880a9 SHA256 f0e2ca284d80834cd94e3ba26a257c9c6a03aaae5894ae24ddd3663c55534bf9 size 3331
-MD5 66c617907b1fa56c9e21f6674c7b09ee ChangeLog 3331
-RMD160 1483144b9e265599be73b2f850ca425ef92c28a5 ChangeLog 3331
-SHA256 f0e2ca284d80834cd94e3ba26a257c9c6a03aaae5894ae24ddd3663c55534bf9 ChangeLog 3331
-MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
+DIST SDL_sound-1.0.1.tar.gz 1019056 RMD160 28d934d604e5db9b3b0b681785406587323ea765 SHA1 9cb8550facf64f941179ba5767f763d1d52ddd6b SHA256 8289b483d994283d599686643d402d073c8dd6c067a9c5b232a7e3e03eca4089
+EBUILD sdl-sound-1.0.1-r1.ebuild 1171 RMD160 c83afb4234e2baf7b5780575e60fb9a79eae1320 SHA1 8d1b7e4605f2f05a15893db1199bcaaad83061b3 SHA256 9a24f00953d058fc02f3c173b7d838a22e3c939fa0e0cb45afbdd56cbba02f62
+MD5 a736b55c57fbdce4fa85bd9e98023ea1 sdl-sound-1.0.1-r1.ebuild 1171
+RMD160 c83afb4234e2baf7b5780575e60fb9a79eae1320 sdl-sound-1.0.1-r1.ebuild 1171
+SHA256 9a24f00953d058fc02f3c173b7d838a22e3c939fa0e0cb45afbdd56cbba02f62 sdl-sound-1.0.1-r1.ebuild 1171
+EBUILD sdl-sound-1.0.1-r2.ebuild 1596 RMD160 8d743a353f430fb642519582e1f19889304223db SHA1 6d93a2fa9b3fca9c7ddfb74ac58068244ddab182 SHA256 4c3c1e1a3bc72ccfd776bf1a0514cab06709ced844834ff8811368b51e8ff603
+MD5 e1b3f9848e9dcf1c290939a725f95c75 sdl-sound-1.0.1-r2.ebuild 1596
+RMD160 8d743a353f430fb642519582e1f19889304223db sdl-sound-1.0.1-r2.ebuild 1596
+SHA256 4c3c1e1a3bc72ccfd776bf1a0514cab06709ced844834ff8811368b51e8ff603 sdl-sound-1.0.1-r2.ebuild 1596
+EBUILD sdl-sound-1.0.1.ebuild 1584 RMD160 0ad1b551ced6826836deda7ab200af42575d2233 SHA1 4dc0e57c6d3df9f115d440895217597ee23f4b39 SHA256 0d7fec3af124265586e4dd3a6d97eda070150e40b2845c16bdc51f8f8ad040c4
+MD5 a7b27d2e1a47bdb6a6f14d2aa050b93a sdl-sound-1.0.1.ebuild 1584
+RMD160 0ad1b551ced6826836deda7ab200af42575d2233 sdl-sound-1.0.1.ebuild 1584
+SHA256 0d7fec3af124265586e4dd3a6d97eda070150e40b2845c16bdc51f8f8ad040c4 sdl-sound-1.0.1.ebuild 1584
+MISC ChangeLog 3536 RMD160 710d234d5d012973277a3e601574eeeb5dc4a6a1 SHA1 36379c14c58489282eedbf010bf17726f028384e SHA256 b5646e1881ad58b3ea9107714f7fb2aac3d6cf830b65bdd8a18793a9113ac401
+MD5 5a01624cb68d2b99001329941e8e18c2 ChangeLog 3536
+RMD160 710d234d5d012973277a3e601574eeeb5dc4a6a1 ChangeLog 3536
+SHA256 b5646e1881ad58b3ea9107714f7fb2aac3d6cf830b65bdd8a18793a9113ac401 ChangeLog 3536
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 ac57f8a9a3aceed84463057baf569ddf files/digest-sdl-sound-1.0.1 68
-RMD160 0d4739c52bd23837b9ebe7346ee4f5432fa78d52 files/digest-sdl-sound-1.0.1 68
-SHA256 205d169954bbd4f215203b3c9d7e2ed6db72335327d69841db7c348ab7939646 files/digest-sdl-sound-1.0.1 68
-MD5 ac57f8a9a3aceed84463057baf569ddf files/digest-sdl-sound-1.0.1-r1 68
-RMD160 0d4739c52bd23837b9ebe7346ee4f5432fa78d52 files/digest-sdl-sound-1.0.1-r1 68
-SHA256 205d169954bbd4f215203b3c9d7e2ed6db72335327d69841db7c348ab7939646 files/digest-sdl-sound-1.0.1-r1 68
-MD5 ac57f8a9a3aceed84463057baf569ddf files/digest-sdl-sound-1.0.1-r2 68
-RMD160 0d4739c52bd23837b9ebe7346ee4f5432fa78d52 files/digest-sdl-sound-1.0.1-r2 68
-SHA256 205d169954bbd4f215203b3c9d7e2ed6db72335327d69841db7c348ab7939646 files/digest-sdl-sound-1.0.1-r2 68
+MD5 3148af24b1e50a7e5ee276edd4700495 files/digest-sdl-sound-1.0.1 250
+RMD160 a13ea096dd2f925500e055d957f0684df80a3453 files/digest-sdl-sound-1.0.1 250
+SHA256 80a951727833441b7af1972863c025dfde3219044d8bca92abce4ec5276aaf6e files/digest-sdl-sound-1.0.1 250
+MD5 3148af24b1e50a7e5ee276edd4700495 files/digest-sdl-sound-1.0.1-r1 250
+RMD160 a13ea096dd2f925500e055d957f0684df80a3453 files/digest-sdl-sound-1.0.1-r1 250
+SHA256 80a951727833441b7af1972863c025dfde3219044d8bca92abce4ec5276aaf6e files/digest-sdl-sound-1.0.1-r1 250
+MD5 3148af24b1e50a7e5ee276edd4700495 files/digest-sdl-sound-1.0.1-r2 250
+RMD160 a13ea096dd2f925500e055d957f0684df80a3453 files/digest-sdl-sound-1.0.1-r2 250
+SHA256 80a951727833441b7af1972863c025dfde3219044d8bca92abce4ec5276aaf6e files/digest-sdl-sound-1.0.1-r2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFN7gFAiZjviIA2XgRAjiIAJ0XjwunCdDC+rCQz24W0DQVCcmhwACg7hvn
+PY0omRzENO1fHqExcbIno40=
+=ZLNh
+-----END PGP SIGNATURE-----
diff --git a/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1 b/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1
index 3bda76f3e513..a46d066d44c6 100644
--- a/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1
+++ b/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1
@@ -1 +1,3 @@
 MD5 49e197ef7c8ab623d0640dc74be43160 SDL_sound-1.0.1.tar.gz 1019056
+RMD160 28d934d604e5db9b3b0b681785406587323ea765 SDL_sound-1.0.1.tar.gz 1019056
+SHA256 8289b483d994283d599686643d402d073c8dd6c067a9c5b232a7e3e03eca4089 SDL_sound-1.0.1.tar.gz 1019056
diff --git a/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r1 b/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r1
index 3bda76f3e513..a46d066d44c6 100644
--- a/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r1
+++ b/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r1
@@ -1 +1,3 @@
 MD5 49e197ef7c8ab623d0640dc74be43160 SDL_sound-1.0.1.tar.gz 1019056
+RMD160 28d934d604e5db9b3b0b681785406587323ea765 SDL_sound-1.0.1.tar.gz 1019056
+SHA256 8289b483d994283d599686643d402d073c8dd6c067a9c5b232a7e3e03eca4089 SDL_sound-1.0.1.tar.gz 1019056
diff --git a/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r2 b/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r2
index 3bda76f3e513..a46d066d44c6 100644
--- a/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r2
+++ b/media-libs/sdl-sound/files/digest-sdl-sound-1.0.1-r2
@@ -1 +1,3 @@
 MD5 49e197ef7c8ab623d0640dc74be43160 SDL_sound-1.0.1.tar.gz 1019056
+RMD160 28d934d604e5db9b3b0b681785406587323ea765 SDL_sound-1.0.1.tar.gz 1019056
+SHA256 8289b483d994283d599686643d402d073c8dd6c067a9c5b232a7e3e03eca4089 SDL_sound-1.0.1.tar.gz 1019056
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.1-r1.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.1-r1.ebuild
index 9b5a78d159af..58933442e2ee 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.1-r1.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.1-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-libs/sdl-sound/sdl-sound-1.0.1-r1.ebuild,v 1.5 2006/03/18 16:11:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.1-r1.ebuild,v 1.6 2006/10/19 17:38:05 flameeyes Exp $
 
 MY_P="${P/sdl-/SDL_}"
 DESCRIPTION="A library that handles the decoding of sound file formats"
@@ -13,7 +13,7 @@ KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="flac mikmod vorbis speex physfs"
 
 DEPEND=">=media-libs/libsdl-1.2
-	flac? ( media-libs/flac )
+	flac? ( ~media-libs/flac-1.1.2 )
 	mikmod? ( >=media-libs/libmikmod-3.1.9 )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	speex? ( media-libs/speex
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild
index 4f2d162aa1e4..4a7b9ca726b2 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.1-r2.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-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild,v 1.6 2006/05/15 08:28:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.1-r2.ebuild,v 1.7 2006/10/19 17:38:05 flameeyes Exp $
 
 inherit flag-o-matic autotools eutils
 
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flac mikmod vorbis speex physfs mp3 mpeg"
 
 RDEPEND=">=media-libs/libsdl-1.2
-	flac? ( media-libs/flac )
+	flac? ( ~media-libs/flac-1.1.2 )
 	mikmod? ( >=media-libs/libmikmod-3.1.9 media-libs/libmodplug )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	speex? ( media-libs/speex
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.1.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.1.ebuild
index 09cfd2f7feb4..3137ae855318 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.1.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.1.ebuild,v 1.10 2005/12/26 12:50:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-sound/sdl-sound-1.0.1.ebuild,v 1.11 2006/10/19 17:38:05 flameeyes Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ IUSE="flac mikmod vorbis speex physfs"
 
 DEPEND=">=media-libs/libsdl-1.2
 	>=media-libs/smpeg-0.4.4-r1
-	flac? ( media-libs/flac )
+	flac? ( ~media-libs/flac-1.1.2 )
 	mikmod? ( >=media-libs/libmikmod-3.1.9 )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
 	speex? ( media-libs/speex