Attempt to fix the pulseaudio vs xlib mess

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 24 insertions, 16 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 200be7f5581e..a2f52f96ad66 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.651 2011/01/26 08:46:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.652 2011/01/26 10:40:09 aballier Exp $
+
+  26 Jan 2011; Alexis Ballier <aballier@gentoo.org> vlc-1.1.6.ebuild,
+  vlc-1.1.9999.ebuild:
+  Attempt to fix the pulseaudio vs xlib mess
 
   26 Jan 2011; Christian Faulhammer <fauli@gentoo.org> vlc-1.1.6.ebuild:
   stable x86, security bug 352206
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index fd9ade3c1ea5..d0f3e8081710 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -11,15 +11,15 @@ DIST vlc-patches-90.tar.bz2 3836 RMD160 b77017afe5e707bea472dd318aed265aefc4364b
 EBUILD vlc-1.1.4.1.ebuild 11981 RMD160 e2c6701494dac52d8a784b234722d6367630242e SHA1 bc8df5385a9d19269a611c06287a2a8ef10f8d34 SHA256 2f104f95fc1405b549fee1da8e57cd5d1762e3040d940584b2869ac0ca50253b
 EBUILD vlc-1.1.4.ebuild 11973 RMD160 0c2b9fcddbcbfa56f9f8f9ae6a32d29a276eef43 SHA1 2dbf8285b9c6c1d44c23f2d8c5ac91c27e640654 SHA256 159648e61b2582d293c23f06d5110a0419203ffae3175243d5796ef2335647a5
 EBUILD vlc-1.1.5.ebuild 12080 RMD160 08f59cd6ba634267a3134681c5049ebed5250cf8 SHA1 c4809e386833fcc86c0608bb613b3c0652d2cd02 SHA256 761d2089ed74f9095479e5c902642a967863a06889b09e8337bea40e7c4e99d2
-EBUILD vlc-1.1.6.ebuild 12077 RMD160 92f20ed66122ab1d784c1daf97d5bcb6bc22cbb4 SHA1 72603a96c527b50b6d17ddb330301ac5c6220bd4 SHA256 c0acd343ede00246bd2379ae4753c32c2f36607bb188f2ee30c34a5dffbe9939
-EBUILD vlc-1.1.9999.ebuild 12100 RMD160 7ce3d35aef3ea07775de4eade116758c977859b3 SHA1 ed5fdc08d1655cb607e835e4f46fe1db68d322ec SHA256 229e24ffe0a46b9ea8c7f15a1bfbb6c2f0064bd9084f4461d9827e6cffabde78
+EBUILD vlc-1.1.6.ebuild 12260 RMD160 27aab79fb2fe420076b40f6e49f2033ebce398c2 SHA1 c7fddf0e63f6b60ddce106072ac3648f134efaad SHA256 4a764298ceb6b1054a8bf2314da781851bbb4dd59fdb196326ea5fb5e57d12a5
+EBUILD vlc-1.1.9999.ebuild 12280 RMD160 e7e42fd81239d7151280219c89c88350505e5d5f SHA1 b13979bc3cff3478efe29e8181de1e1b13a84107 SHA256 8a31788ba75dcb01a467c315b11110a2e0d2ed3f823233d87e6572d296da6843
 EBUILD vlc-9999.ebuild 11085 RMD160 fb4b580ae26070acfd1b4190a9f3d53dfbce7416 SHA1 4f622fe5c1cc800ed100da70d112a0c3cc6838dd SHA256 3859a72c576904a90d347c6964972aef5a37e8d63c78071086fcf1ebccab872a
-MISC ChangeLog 99175 RMD160 e5fe8979d16c9086fea783a2842a50213ad01f96 SHA1 b5ff1adc6aa87224efa69cc3afb2e99356dd86d6 SHA256 396e200f8b453297aa09b4de96eaa44fcca36ec138d64fc4ca0af6e885fbca5b
+MISC ChangeLog 99317 RMD160 7a0cc8a6c5ce7c9ba9bf37c7867eadb4f19a39c5 SHA1 2f5212a7f93a710b2080d5c6a3e5d3679fa71d7e SHA256 d0e65c9e228bc3202bf04a488b59b34f8d61a130a8fa2c86280134a8669d8cd7
 MISC metadata.xml 4211 RMD160 2a8b9684d21db73920b1967ea27af9828250c228 SHA1 5c4e0725c9e48f64c7b26237327c34ffe00cc976 SHA256 baa70c6763379c4f483ff330bb5f141882b6ea448c07be55c445bed332c5342e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0/34IACgkQNQqtfCuFneMKTQCfWRyUE8THIGIAcY6bdlfeYP2/
-tacAn19rjgzc6es7i+3U39uL33lCEbxn
-=uVm0
+iEYEARECAAYFAk0/+hQACgkQvFcC4BYPU0rrUACgmnlbbz31fOXGR6vQ7ZI0gQJB
+saoAnifa8ZrVCLiuw4mcwcCLNx26meKz
+=W9lh
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.6.ebuild b/media-video/vlc/vlc-1.1.6.ebuild
index c54558d679d0..46c32d50fdaa 100644
--- a/media-video/vlc/vlc-1.1.6.ebuild
+++ b/media-video/vlc/vlc-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild,v 1.4 2011/01/26 08:46:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild,v 1.5 2011/01/26 10:40:09 aballier Exp $
 
 EAPI="3"
 
@@ -109,8 +109,8 @@ RDEPEND="
 		opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
 		png? ( media-libs/libpng sys-libs/zlib )
 		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11
-			!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
+		pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22
+			( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
 		samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
@@ -184,6 +184,7 @@ pkg_setup() {
 	vlc_use_force vlm stream
 	vlc_use_force vaapi ffmpeg
 	vlc_use_force nsplugin xcb
+	has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -338,7 +339,8 @@ src_configure() {
 		$(vlc_use_enable_force remoteosd libgcrypt) \
 		$(vlc_use_enable_force gnutls libgcrypt) \
 		$(vlc_use_enable_force vaapi avcodec) \
-		$(vlc_use_enable_force nsplugin xcb)
+		$(vlc_use_enable_force nsplugin xcb) \
+		$(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x')
 }
 
 src_install() {
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index ba495488dd3d..fa5a00453ff4 100644
--- a/media-video/vlc/vlc-1.1.9999.ebuild
+++ b/media-video/vlc/vlc-1.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.22 2011/01/02 14:40:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.23 2011/01/26 10:40:09 aballier Exp $
 
 EAPI="3"
 
@@ -109,8 +109,8 @@ RDEPEND="
 		opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
 		png? ( media-libs/libpng sys-libs/zlib )
 		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11
-			!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
+		pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22
+			( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) )
 		qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 )
 		remoteosd? ( >=dev-libs/libgcrypt-1.2.0 )
 		samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) )
@@ -184,6 +184,7 @@ pkg_setup() {
 	vlc_use_force vlm stream
 	vlc_use_force vaapi ffmpeg
 	vlc_use_force nsplugin xcb
+	has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X
 
 	# Useflags that will be automagically discarded if deps are not met
 	vlc_use_needs bidi truetype
@@ -338,7 +339,8 @@ src_configure() {
 		$(vlc_use_enable_force remoteosd libgcrypt) \
 		$(vlc_use_enable_force gnutls libgcrypt) \
 		$(vlc_use_enable_force vaapi avcodec) \
-		$(vlc_use_enable_force nsplugin xcb)
+		$(vlc_use_enable_force nsplugin xcb) \
+		$(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x')
 }
 
 src_install() {