Pulseaudio does not require X but we need to have the X useflag enabled if it is enabled on pulseaudio

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

4 files changed, 24 insertions, 13 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 63e81b6df958..24710c92fc3f 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.585 2010/05/19 07:36:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.586 2010/05/25 07:02:33 aballier Exp $
+
+  25 May 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.9999.ebuild,
+  vlc-9999.ebuild:
+  Pulseaudio does not require X but we need to have the X useflag enabled if
+  it is enabled on pulseaudio
 
   19 May 2010; Alexis Ballier <aballier@gentoo.org> vlc-1.1.0_pre4.ebuild,
   vlc-1.1.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d202233b34ce..4d3b2e4d6ab0 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,14 +9,14 @@ DIST vlc-patches-85.tar.bz2 3361 RMD160 59cee85e2f6ad560cd3102b83ab7e0a6ad990164
 EBUILD vlc-1.0.6.ebuild 12316 RMD160 f9e95b57ca80417f744808f47d92f92c4a1f8027 SHA1 ad8ba73ec351c0623a91b28bd27aad44893a5d99 SHA256 a5c00bd42a93d39eb356b43f6e9ba660db0138690bd19b302041514507b8c62c
 EBUILD vlc-1.0.9999.ebuild 12274 RMD160 907353609dd74ed3feae7521b68bd935b1c41314 SHA1 052cf8cf27b9e8719c8807a1561b8b10d3d48adc SHA256 7fbeecfc14a13c0e315e9a85e6b2389497fbc5f88abc4ad83953fa477d42102d
 EBUILD vlc-1.1.0_pre4.ebuild 11999 RMD160 03dfb7b6eb8c979695b81e2eff24b1bacc49974d SHA1 f2f83a772cac9dc35bc0fd9ddeb30d605401fe45 SHA256 a5d875101dcae067c9f7f633280ddc26e61d549dd812c332ea0b1941d11177d8
-EBUILD vlc-1.1.9999.ebuild 11945 RMD160 69ad1385f55c42f5052c694c27eb6831cf49dc29 SHA1 80ababd4746435941b7af3cd2c29db6da5b86f92 SHA256 843b8df650ab67cdd38407852a3ee076ed6798aa5a1381dbadb394ff1192396b
-EBUILD vlc-9999.ebuild 11942 RMD160 6da447aa845ff2c67accca7383ee99fc8e68dd5e SHA1 bedd8694f5778db7139c6d5e35bbea97edbb4680 SHA256 75fae6707422cf82f25a543f97c371f6a0a62b215ebcd0fddafa0a62a263bf25
-MISC ChangeLog 90701 RMD160 c58d0fcb54e3c7628ed4e89222b4cb8e7495448c SHA1 fbdbcd1464f9a4578dc60bc370e0b0f3d09df3e5 SHA256 93174f104e3842fe52429de77c3e9cdef55a1bb5898ab697cc67d3d2cb5d15c7
+EBUILD vlc-1.1.9999.ebuild 12024 RMD160 4b465629ba058b97840df849d21d0edfb4ab6b1f SHA1 063e77dd5a6a19110f3120930438b115b8c56c2e SHA256 16538ade0953e9e46c82f13f69f4a6aef97b71431f6122c377f0c53067d5a3ef
+EBUILD vlc-9999.ebuild 12021 RMD160 ece397d7ff4b265cec4e5d71b28c6af2ab588043 SHA1 1588c1a347827baf7fe76b8ddb746b886e96635f SHA256 eb44fd663c1974c64368ca8b901e89161d2c6f8f8e1bb6ef374b429f66a5b785
+MISC ChangeLog 90901 RMD160 02901217544871c63df0e411e4a0ed6a8094a6f9 SHA1 313966ff872dc2de5f03f39c4eb3c6c0ff16e47b SHA256 b0c8f75cbca26627c7c7e8b4262e0f6a47efbf46843d0380c7f43a48ab2c5895
 MISC metadata.xml 4240 RMD160 548096f0459b43b103c315e07db92e50563ea1e7 SHA1 8a12510531e256c4fad1fc6dd6c28e56c0ab46eb SHA256 fdf69f66df99eb7339d0d12d2baddb8b8d338c839ae7d12051375e38621006a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvzlREACgkQvFcC4BYPU0pnbACeMsET9YbapZ3FS4cTVW3J1VAS
-xH0AoJUUn/dE0phJ3fv1Xc6PALdhU9wI
-=jW1F
+iEYEARECAAYFAkv7dg8ACgkQvFcC4BYPU0rajgCdH8qMhUIajZGIO/nZOciNyIPM
+DOAAoJwkpCt2hVgSjcVbDjyAE1tSLUdj
+=DBZZ
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 7016f82f07eb..8ce87f1dbe98 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-2010 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.6 2010/05/19 07:36:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.7 2010/05/25 07:02:33 aballier Exp $
 
 EAPI="2"
 
@@ -53,7 +53,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
 	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
-	vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
+	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
 		!!<=media-video/vlc-1.0.99999
@@ -109,7 +109,8 @@ RDEPEND="
 		opengl? ( virtual/opengl )
 		png? ( media-libs/libpng sys-libs/zlib )
 		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.11
+			!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
 		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]
@@ -140,6 +141,7 @@ RDEPEND="
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
+		X? ( x11-libs/libX11 )
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 		xml? ( dev-libs/libxml2 )
@@ -323,6 +325,7 @@ src_configure() {
 		$(use_enable vorbis) \
 		$(use_enable win32codecs loader) \
 		$(use_enable wma-fixed) \
+		$(use_with X x) \
 		$(use_enable x264) \
 		$(use_enable xcb) \
 		$(use_enable xml libxml2) \
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 1c301a77508d..4de81a0914d7 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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-video/vlc/vlc-9999.ebuild,v 1.73 2010/05/19 07:36:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.74 2010/05/25 07:02:33 aballier Exp $
 
 EAPI="2"
 
@@ -53,7 +53,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	png projectm pulseaudio pvr +qt4 remoteosd rtsp run-as-root samba
 	schroedinger sdl sdl-image shine shout skins speex sqlite sse stream
 	svg svga taglib theora truetype twolame udev upnp v4l v4l2 vaapi vcdx vlm
-	vorbis win32codecs wma-fixed x264 +xcb xml xosd xv zvbi"
+	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
 		!!<=media-video/vlc-1.0.99999
@@ -109,7 +109,8 @@ RDEPEND="
 		opengl? ( virtual/opengl )
 		png? ( media-libs/libpng sys-libs/zlib )
 		projectm? ( media-libs/libprojectm )
-		pulseaudio? ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 )
+		pulseaudio? ( >=media-sound/pulseaudio-0.9.11
+			!X? ( >=media-sound/pulseaudio-0.9.11[-X] ) )
 		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]
@@ -140,6 +141,7 @@ RDEPEND="
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
 		win32codecs? ( media-libs/win32codecs )
+		X? ( x11-libs/libX11 )
 		x264? ( >=media-libs/x264-0.0.20090923 )
 		xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 		xml? ( dev-libs/libxml2 )
@@ -323,6 +325,7 @@ src_configure() {
 		$(use_enable vorbis) \
 		$(use_enable win32codecs loader) \
 		$(use_enable wma-fixed) \
+		$(use_with X x) \
 		$(use_enable x264) \
 		$(use_enable xcb) \
 		$(use_enable xml libxml2) \