add a dvbpsi useflag, enabled by default and with a correct description, as its needed to read Mpeg-TS files. Bug #405267

(Portage version: 2.2.0_alpha88/cvs/Linux x86_64)

5 files changed, 22 insertions, 13 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 7825f7d6b24d..e2942cb1ea70 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.783 2012/02/20 20:56:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.784 2012/02/23 10:05:32 aballier Exp $
+
+  23 Feb 2012; Alexis Ballier <aballier@gentoo.org> vlc-2.0.0.ebuild,
+  vlc-2.0.9999.ebuild, vlc-9999.ebuild, metadata.xml:
+  add a dvbpsi useflag, enabled by default and with a correct description, as
+  its needed to read Mpeg-TS files. Bug #405267
 
   20 Feb 2012; Alexis Ballier <aballier@gentoo.org> vlc-2.0.0.ebuild:
   drop arm keyword prior to unmasking for bug #397891
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 040d4f6da5c2..35c036a60c5e 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -17,6 +17,7 @@
 	<flag name="direct2d">Enable Win7/VistaPU Direct2D support.</flag>
 	<flag name="directx">Enable Win32 DirectX support.</flag>
 	<flag name="dshow">Enables Win32 DirectShow support.</flag>
+	<flag name="dvbpsi">Enables support for Mpeg-TS files (.ts, .m2ts, .mts) via <pkg>media-libs/libdvbpsi</pkg>.</flag>
 	<flag name="dxva2">Enables Win32 DxVA2 support.</flag>
 	<flag name="egl">Enables EGL video output module.</flag>
 	<flag name="fbosd">Enables the framebuffer overlay plugin.</flag>
diff --git a/media-video/vlc/vlc-2.0.0.ebuild b/media-video/vlc/vlc-2.0.0.ebuild
index 627e20e5c15f..c8ad6b5aee56 100644
--- a/media-video/vlc/vlc-2.0.0.ebuild
+++ b/media-video/vlc/vlc-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.0.ebuild,v 1.3 2012/02/20 20:56:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.0.ebuild,v 1.4 2012/02/23 10:05:32 aballier Exp $
 
 EAPI="4"
 
@@ -45,7 +45,7 @@ else
 fi
 IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb dvd dxva2 elibc_glibc egl +encode
+	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
 	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
 	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
 	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
@@ -74,7 +74,7 @@ RDEPEND="
 		dirac? ( >=media-video/dirac-0.10.0 )
 		directfb? ( dev-libs/DirectFB sys-libs/zlib )
 		dts? ( media-libs/libdca )
-		dvb? ( >=media-libs/libdvbpsi-0.1.6 )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 )
 		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
 		egl? ( virtual/opengl )
 		elibc_glibc? ( >=sys-libs/glibc-2.8 )
@@ -159,6 +159,7 @@ REQUIRED_USE="
 	aalib? ( X )
 	bidi? ( truetype )
 	cddb? ( cdda )
+	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
 	egl? ( X )
 	ffmpeg? ( avcodec avformat postproc swscale )
@@ -224,7 +225,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable dshow) \
 		$(use_enable dts dca) \
-		$(use_enable dvb dvbpsi) \
+		$(use_enable dvbpsi) \
 		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
 		$(use_enable dxva2) \
 		$(use_enable egl) \
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index d2656a03a95f..fc614ca21d38 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.3 2012/02/20 20:52:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.4 2012/02/23 10:05:32 aballier Exp $
 
 EAPI="4"
 
@@ -45,7 +45,7 @@ else
 fi
 IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb dvd dxva2 elibc_glibc egl +encode
+	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
 	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
 	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
 	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
@@ -74,7 +74,7 @@ RDEPEND="
 		dirac? ( >=media-video/dirac-0.10.0 )
 		directfb? ( dev-libs/DirectFB sys-libs/zlib )
 		dts? ( media-libs/libdca )
-		dvb? ( >=media-libs/libdvbpsi-0.1.6 )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 )
 		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
 		egl? ( virtual/opengl )
 		elibc_glibc? ( >=sys-libs/glibc-2.8 )
@@ -159,6 +159,7 @@ REQUIRED_USE="
 	aalib? ( X )
 	bidi? ( truetype )
 	cddb? ( cdda )
+	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
 	egl? ( X )
 	ffmpeg? ( avcodec avformat postproc swscale )
@@ -224,7 +225,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable dshow) \
 		$(use_enable dts dca) \
-		$(use_enable dvb dvbpsi) \
+		$(use_enable dvbpsi) \
 		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
 		$(use_enable dxva2) \
 		$(use_enable egl) \
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 6f41958aa545..d0cc070305c9 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.161 2012/02/20 20:52:04 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.162 2012/02/23 10:05:32 aballier Exp $
 
 EAPI="4"
 
@@ -45,7 +45,7 @@ else
 fi
 IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+avformat bidi bluray cdda cddb dbus dc1394 debug dirac direct2d
-	directfb directx dshow dts dvb dvd dxva2 elibc_glibc egl +encode
+	directfb directx dshow dts dvb +dvbpsi dvd dxva2 elibc_glibc egl +encode
 	fbosd fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
 	growl httpd ieee1394 ios-vout jack kate kde libass libcaca libnotify
 	libproxy libsamplerate libtiger linsys libtar lirc live lua +macosx
@@ -74,7 +74,7 @@ RDEPEND="
 		dirac? ( >=media-video/dirac-0.10.0 )
 		directfb? ( dev-libs/DirectFB sys-libs/zlib )
 		dts? ( media-libs/libdca )
-		dvb? ( >=media-libs/libdvbpsi-0.1.6 )
+		dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 )
 		dvd? (	media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 )
 		egl? ( virtual/opengl )
 		elibc_glibc? ( >=sys-libs/glibc-2.8 )
@@ -158,6 +158,7 @@ REQUIRED_USE="
 	aalib? ( X )
 	bidi? ( truetype )
 	cddb? ( cdda )
+	dvb? ( dvbpsi )
 	dxva2? ( avcodec )
 	egl? ( X )
 	ffmpeg? ( avcodec avformat postproc swscale )
@@ -223,7 +224,7 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable dshow) \
 		$(use_enable dts dca) \
-		$(use_enable dvb dvbpsi) \
+		$(use_enable dvbpsi) \
 		$(use_enable dvd dvdread) $(use_enable dvd dvdnav) \
 		$(use_enable dxva2) \
 		$(use_enable egl) \