Only require libsdl[alsa] when xbmc is being built with USE=alsa #327727 by Džen.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 18 insertions, 12 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index caf19f7cd2db..c423e64f917f 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.60 2010/06/21 20:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.61 2010/07/11 19:35:11 vapier Exp $
+
+  11 Jul 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild,
+  xbmc-9999.ebuild:
+  Only require libsdl[alsa] when xbmc is being built with USE=alsa #327727
+  by Džen.
 
   21 Jun 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild:
   Fix building with ffmpeg-0.6 #324293 by Alexis Ballier.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 781f1388bba3..3e8aef14db0b 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -8,15 +8,14 @@ AUX xbmc-9.11-shader-upscalers.patch 29024 RMD160 d100a35684cad2a6dea0c6eeb9bfbc
 AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
-EBUILD xbmc-9.11-r3.ebuild 5062 RMD160 bd1d51bf0637833c8ea1e6a79a00bc0a5dbbeaa1 SHA1 bd451c1b37c11d800496d40a5657b2ac21d65ed8 SHA256 0f34e65defa5b970eb91e69d42ac1e37ab032797e2d98fc8b7386d736ab983ad
-EBUILD xbmc-9.11-r4.ebuild 5674 RMD160 fd995e1a4e36b191e719e62dda71c1247481fad0 SHA1 e9bf1a2f733f70d31e2d369fa6e2974c54862e3d SHA256 20021dabb346da065e8d17e6dc13b7a1ca131492b5741b0ea7f8f08c8f9a0f19
-EBUILD xbmc-9999.ebuild 4953 RMD160 ad9b8355fba361da8f4121669bd882d60396164b SHA1 62401f964e5643260513c0ff4bca02d33c2f0d9c SHA256 359b4d5954506f32342bd514c83b42e2fb3b5002ce299368ad378a946b6cee00
-MISC ChangeLog 10023 RMD160 d30e1ad5bc2e8c6a1e63ff4bd27816cb3103b473 SHA1 f25c578528cf27d80e971d286df43e0f18cbf05b SHA256 80ef76774b60be04a2a2f6f27584240273ad5e6f8857b7d0734de84e8f8169a3
+EBUILD xbmc-9.11-r4.ebuild 5704 RMD160 de3987bef34192292be9aa0cee35d014a2144335 SHA1 b2060e366457354533fe8b858ac6bd7a77ae09ee SHA256 5b396e1186d1bf500fff19605a2d384dd1440f1b75508434ca3a268ca0d7ed3f
+EBUILD xbmc-9999.ebuild 4985 RMD160 0f643eb099962f6da56ebdb135c1e6aaf25d0011 SHA1 67fe72927eccda5b92c9a4b1cd1ac50a2ad36ccd SHA256 41347058cdb957395d537f8303a4a0c075d2623f525087f52e049926fd4d64d8
+MISC ChangeLog 10202 RMD160 3082fcee8aa165fe59c733de23f00ce34d8f2dcb SHA1 5917ba577b11b2c9acbfafc68c5fb713eb47d885 SHA256 be65559d0b72c12b098125fd090fd98121491b041027d2b594c6d193862f46bd
 MISC metadata.xml 446 RMD160 8784194c0d5667ad0a7a662e090aaf2006a2dc9a SHA1 28161d5a31a40fb383431a1b069b45270938bcc2 SHA256 ef0d7c7d3311d8a7b2b534d8e0e5ae8216dbbc91bb1a808d7d427f828be5bad8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkwfxRoACgkQTwhj9JtAlp4OOgEAtUxfJXX14qrPagb3s+Q/cqe+
-HPo2qdoz+xJt1HziitcBAKEb18F6qBFzWqZ7rTxkb3xrvyu73RhbJrmqpnRcvacC
-=v1F+
+iF4EAREIAAYFAkw6HHAACgkQTwhj9JtAlp4yCgEAnECqw+9aSv1XqM3iSCPjlRDW
+5sMcWjf5VqARzwy3AwsA/33leChFw+T3xVC9gZW++1yZL4lzkBDJ/0xtucOxmfAb
+=qZuf
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9.11-r4.ebuild b/media-tv/xbmc/xbmc-9.11-r4.ebuild
index d0b6d0367ff5..e8eac86c0c44 100644
--- a/media-tv/xbmc/xbmc-9.11-r4.ebuild
+++ b/media-tv/xbmc/xbmc-9.11-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r4.ebuild,v 1.3 2010/06/21 20:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r4.ebuild,v 1.4 2010/07/11 19:35:11 vapier Exp $
 
 EAPI="2"
 
@@ -60,7 +60,8 @@ RDEPEND="virtual/opengl
 	media-libs/libmpeg2
 	media-libs/libogg
 	media-libs/libsamplerate
-	media-libs/libsdl[alsa,audio,opengl,video,X]
+	media-libs/libsdl[audio,opengl,video,X]
+	alsa? ( media-libs/libsdl[alsa] )
 	media-libs/libvorbis
 	media-libs/sdl-gfx
 	media-libs/sdl-image[gif,jpeg,png]
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 10191bc88ee0..0a6615cfed4e 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.57 2010/06/19 00:57:39 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.58 2010/07/11 19:35:11 vapier Exp $
 
 EAPI="2"
 
@@ -61,7 +61,8 @@ RDEPEND="virtual/opengl
 	media-libs/libmpeg2
 	media-libs/libogg
 	media-libs/libsamplerate
-	media-libs/libsdl[alsa,audio,opengl,video,X]
+	media-libs/libsdl[audio,opengl,video,X]
+	alsa? ( media-libs/libsdl[alsa] )
 	media-libs/libvorbis
 	media-libs/sdl-gfx
 	media-libs/sdl-image[gif,jpeg,png]