Allow to build without dvbpsi

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

4 files changed, 17 insertions, 10 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 952c9c466b86..59b4f414d6b7 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.670 2011/02/16 17:58:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.671 2011/02/16 18:04:28 aballier Exp $
+
+  16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild,
+  metadata.xml:
+  Allow to build without dvbpsi
 
   16 Feb 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild,
   metadata.xml:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index d3f3dd2081a2..b9065925d4c6 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -7,13 +7,13 @@ DIST vlc-patches-89.tar.bz2 3370 RMD160 da3c173817f6666abfaaef5762af58f3810e5180
 DIST vlc-patches-91.tar.bz2 3955 RMD160 37024ac3d68f0c36f711bb680c573976e4e729e8 SHA1 987ac5f47926d76073e84643023df346f9a0027a SHA256 9863e9fd62bf07641e3e99cbd11194cd462ad99ca1719034badfff74419ec451
 EBUILD vlc-1.1.7.ebuild 12269 RMD160 36dc682bb0549b58f7803aa17a055ef0b971ca53 SHA1 1e561a2088c4c4ed3935d24b2a63f02e495a84fb SHA256 261f17b1624e51706b95cf97e5c342b1012147d9027bb1e485aecef29bdcd7e8
 EBUILD vlc-1.1.9999.ebuild 12280 RMD160 e7e42fd81239d7151280219c89c88350505e5d5f SHA1 b13979bc3cff3478efe29e8181de1e1b13a84107 SHA256 8a31788ba75dcb01a467c315b11110a2e0d2ed3f823233d87e6572d296da6843
-EBUILD vlc-9999.ebuild 9751 RMD160 9d50b2b7b46f76c40e38ca1f68e9171f87943120 SHA1 fe7f8eb7d79f80a38ccb6c45c138562551457d52 SHA256 cccc537f2476b61afc44bf3b8f2addd35b28804b635dc3bd86141817e1ebdf97
-MISC ChangeLog 101651 RMD160 1af0516707ad4cc7ddb45cb6200e35a4f4bdfb2f SHA1 025e91324b0a721146c29521010daa5582158036 SHA256 caca4201fcbae2e4a7783612fc2762d89b1ae68c4ca03645976406f2eee01eac
-MISC metadata.xml 4621 RMD160 afc54a548dce932eee86d814e7aa5bcb8f995f72 SHA1 9fd15e5723be1a9cb9726141d02cc48b9d6c87fb SHA256 9d972cee91d1c96d4a53861b260776de77fad35bbbba7d7e2c4d0a3b80f4cb66
+EBUILD vlc-9999.ebuild 9813 RMD160 04ca3aa5403c69dccdae6e891e9f9ed311699b6e SHA1 c2a6bb328e63b824a380baa7fc15f2e7e521dcf6 SHA256 016135284088fa0f8d2bd30cda42251cd844f7f4adce49977a06e419f36b3c65
+MISC ChangeLog 101769 RMD160 d77b492b4cb3dbd855dd559674af8044113512e9 SHA1 ad9cc7496e9087521df5f68d71bf1009bd9567f9 SHA256 13c9e8612da55ef5685ff4c928befcf77cd9c5e4fd9723489fe90cfda2c2e229
+MISC metadata.xml 4695 RMD160 f915707a197e1dfe7c34d31e752592659c4f6bb5 SHA1 d09a200e45911d30842084cc7b0b153358c9db8f SHA256 6e981781ac826da913252cf0c2004549344567012ae3e0083b8b621dccf41964
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1cEEwACgkQvFcC4BYPU0qpQQCeN1ZrGj7HGgjvEXeHp1lFH0QZ
-avkAn2S6jUrq7bBW90zUpRGqkUOaEQeI
-=ftUA
+iEYEARECAAYFAk1cEbIACgkQvFcC4BYPU0pdWgCgt+vHyyfXi4h4MFLXiuV41CdT
+nB8AniEHeYu3jQzQAyFiwYL1RRNQmdGR
+=vzc8
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index bff764ae351f..f0c3e54ff5ff 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
     <flag name="dc1394">Enables IIDC cameras support.</flag>
     <flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
+	<flag name="dvbpsi">Enable ts mux and demux module via libdvbpsi.</flag>
 	<flag name="dshow">Enables Win32 DirectShow support.</flag>
     <flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis (with external sound fonts).</flag>
     <flag name="gcrypt">Enables cryptography support via libgcrypt.</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index f203642c8916..14b4468519a3 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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-9999.ebuild,v 1.111 2011/02/16 17:58:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.112 2011/02/16 18:04:28 aballier Exp $
 
 EAPI="4"
 
@@ -46,7 +46,7 @@ else
 	KEYWORDS=""
 fi
 IUSE="a52 aac aalib alsa altivec atmo avahi bda bidi bluray cdda cddb dbus dc1394
-	debug dirac directfb dshow dts dvb dvd elibc_glibc +encode fbcon fluidsynth +ffmpeg flac fontconfig
+	debug dirac directfb dshow dts dvb +dvbpsi dvd elibc_glibc +encode fbcon fluidsynth +ffmpeg flac fontconfig
 	+gcrypt gme gnome gnutls growl httpd ieee1394 jack kate kde libass libcaca
 	libnotify libproxy libtiger libv4l2 linsys lirc live lua matroska mmx
 	modplug mp3 mpeg mtp musepack ncurses ogg opengl optimisememory oss
@@ -57,7 +57,6 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bda bidi bluray cdda cddb dbus dc139
 
 RDEPEND="
 		sys-libs/zlib
-		>=media-libs/libdvbpsi-0.1.6
 		a52? ( >=media-libs/a52dec-0.7.4-r3 )
 		aalib? ( media-libs/aalib )
 		aac? ( >=media-libs/faad2-2.6.1 )
@@ -71,6 +70,7 @@ RDEPEND="
 		dirac? ( >=media-video/dirac-0.10.0 )
 		directfb? ( dev-libs/DirectFB sys-libs/zlib )
 		dts? ( media-libs/libdca )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 )
 		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
 		elibc_glibc? ( >=sys-libs/glibc-2.8 )
 		ffmpeg? ( >=media-video/ffmpeg-0.6 )
@@ -146,6 +146,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="
 	bidi? ( truetype )
 	cddb? ( cdda )
+	dvb? ( dvbpsi )
 	fontconfig? ( truetype )
 	gnutls? ( gcrypt )
 	libtiger? ( kate )
@@ -204,6 +205,7 @@ src_configure() {
 		$(use_enable dshow) \
 		$(use_enable dts dca) \
 		$(use_enable dvb) \
+		$(use_enable dvbpsi) \
 		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
 		$(use_enable encode sout) \
 		$(use_enable fbcon fb) \