Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt #385241

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

4 files changed, 36 insertions, 28 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index b3abef1cfdc0..fb36a9d638b8 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.747 2011/10/09 18:52:39 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.748 2011/10/31 16:32:02 ssuominen Exp $
+
+  31 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> vlc-1.1.11.ebuild,
+  vlc-1.1.12.ebuild, vlc-1.1.9999.ebuild:
+  Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt
+  #385241
 
   09 Oct 2011; Kacper Kowalik <xarthisius@gentoo.org> vlc-1.1.12.ebuild:
   ppc/ppc64 stable wrt #385953
diff --git a/media-video/vlc/vlc-1.1.11.ebuild b/media-video/vlc/vlc-1.1.11.ebuild
index d851d640b9b2..9a46d9a7f9f4 100644
--- a/media-video/vlc/vlc-1.1.11.ebuild
+++ b/media-video/vlc/vlc-1.1.11.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.11.ebuild,v 1.7 2011/09/22 15:29:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.11.ebuild,v 1.8 2011/10/31 16:32:02 ssuominen Exp $
 
 EAPI="3"
 
@@ -56,7 +56,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	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
+	svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm
 	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
@@ -133,8 +133,10 @@ RDEPEND="
 		twolame? ( media-sound/twolame )
 		udev? ( >=sys-fs/udev-142 )
 		upnp? ( net-libs/libupnp )
-		v4l2? ( libv4l2? ( media-libs/libv4l ) )
-		v4l? ( libv4l? ( media-libs/libv4l ) )
+		v4l? (
+			libv4l2? ( media-libs/libv4l )
+			libv4l? ( media-libs/libv4l )
+			)
 		vaapi? ( x11-libs/libva virtual/ffmpeg )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
@@ -152,8 +154,7 @@ DEPEND="${RDEPEND}
 	alsa? ( >=media-sound/alsa-headers-1.0.23 )
 	dvb? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
+	v4l? ( >=sys-kernel/linux-headers-2.6.25 )
 	xcb? ( x11-proto/xproto )
 	dev-util/pkgconfig"
 
@@ -192,7 +193,7 @@ pkg_setup() {
 	vlc_use_needs bidi truetype
 	vlc_use_needs cddb cdda
 	vlc_use_needs fontconfig truetype
-	vlc_use_needs libv4l2 v4l2
+	vlc_use_needs libv4l2 v4l
 	vlc_use_needs libv4l v4l
 	vlc_use_needs libtiger kate
 	vlc_use_needs xv xcb
@@ -316,8 +317,8 @@ src_configure() {
 		$(use_enable twolame) \
 		$(use_enable udev) \
 		$(use_enable upnp) \
-		$(use_enable v4l) \
-		$(use_enable v4l2) \
+		--disable-v4l \
+		$(use_enable v4l v4l2) \
 		$(use_enable vcdx) \
 		$(use_enable vaapi libva) \
 		$(use_enable vlm) \
diff --git a/media-video/vlc/vlc-1.1.12.ebuild b/media-video/vlc/vlc-1.1.12.ebuild
index 7f701ac4dfb4..703e6147591a 100644
--- a/media-video/vlc/vlc-1.1.12.ebuild
+++ b/media-video/vlc/vlc-1.1.12.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.12.ebuild,v 1.4 2011/10/09 18:52:39 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.12.ebuild,v 1.5 2011/10/31 16:32:02 ssuominen Exp $
 
 EAPI="3"
 
@@ -56,7 +56,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	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
+	svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm
 	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
@@ -133,8 +133,10 @@ RDEPEND="
 		twolame? ( media-sound/twolame )
 		udev? ( >=sys-fs/udev-142 )
 		upnp? ( net-libs/libupnp )
-		v4l2? ( libv4l2? ( media-libs/libv4l ) )
-		v4l? ( libv4l? ( media-libs/libv4l ) )
+		v4l? (
+			libv4l2? ( media-libs/libv4l )
+			libv4l? ( media-libs/libv4l )
+			)
 		vaapi? ( x11-libs/libva virtual/ffmpeg )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
@@ -152,8 +154,7 @@ DEPEND="${RDEPEND}
 	alsa? ( >=media-sound/alsa-headers-1.0.23 )
 	dvb? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
+	v4l? ( >=sys-kernel/linux-headers-2.6.25 )
 	xcb? ( x11-proto/xproto )
 	dev-util/pkgconfig"
 
@@ -192,7 +193,7 @@ pkg_setup() {
 	vlc_use_needs bidi truetype
 	vlc_use_needs cddb cdda
 	vlc_use_needs fontconfig truetype
-	vlc_use_needs libv4l2 v4l2
+	vlc_use_needs libv4l2 v4l
 	vlc_use_needs libv4l v4l
 	vlc_use_needs libtiger kate
 	vlc_use_needs xv xcb
@@ -316,8 +317,8 @@ src_configure() {
 		$(use_enable twolame) \
 		$(use_enable udev) \
 		$(use_enable upnp) \
-		$(use_enable v4l) \
-		$(use_enable v4l2) \
+		--disable-v4l \
+		$(use_enable v4l v4l2) \
 		$(use_enable vcdx) \
 		$(use_enable vaapi libva) \
 		$(use_enable vlm) \
diff --git a/media-video/vlc/vlc-1.1.9999.ebuild b/media-video/vlc/vlc-1.1.9999.ebuild
index 523b8ddfb5cb..44fffee9bbe9 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.33 2011/09/22 15:29:42 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.34 2011/10/31 16:32:02 ssuominen Exp $
 
 EAPI="3"
 
@@ -54,7 +54,7 @@ IUSE="a52 aac aalib alsa altivec atmo avahi bidi cdda cddb dbus dc1394
 	modplug mp3 mpeg mtp musepack ncurses nsplugin ogg opengl optimisememory oss
 	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
+	svg svga taglib theora truetype twolame udev upnp v4l vaapi vcdx vlm
 	vorbis win32codecs wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
@@ -131,8 +131,10 @@ RDEPEND="
 		twolame? ( media-sound/twolame )
 		udev? ( >=sys-fs/udev-142 )
 		upnp? ( net-libs/libupnp )
-		v4l2? ( libv4l2? ( media-libs/libv4l ) )
-		v4l? ( libv4l? ( media-libs/libv4l ) )
+		v4l? (
+			libv4l2? ( media-libs/libv4l )
+			libv4l? ( media-libs/libv4l )
+			)
 		vaapi? ( x11-libs/libva virtual/ffmpeg )
 		vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 )
 		vorbis? ( media-libs/libvorbis )
@@ -150,8 +152,7 @@ DEPEND="${RDEPEND}
 	alsa? ( >=media-sound/alsa-headers-1.0.23 )
 	dvb? ( sys-kernel/linux-headers )
 	kde? ( >=kde-base/kdelibs-4 )
-	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
+	v4l? ( >=sys-kernel/linux-headers-2.6.25 )
 	xcb? ( x11-proto/xproto )
 	dev-util/pkgconfig"
 
@@ -190,7 +191,7 @@ pkg_setup() {
 	vlc_use_needs bidi truetype
 	vlc_use_needs cddb cdda
 	vlc_use_needs fontconfig truetype
-	vlc_use_needs libv4l2 v4l2
+	vlc_use_needs libv4l2 v4l
 	vlc_use_needs libv4l v4l
 	vlc_use_needs libtiger kate
 	vlc_use_needs xv xcb
@@ -311,8 +312,8 @@ src_configure() {
 		$(use_enable twolame) \
 		$(use_enable udev) \
 		$(use_enable upnp) \
-		$(use_enable v4l) \
-		$(use_enable v4l2) \
+		--disable-v4l \
+		$(use_enable v4l v4l2) \
 		$(use_enable vcdx) \
 		$(use_enable vaapi libva) \
 		$(use_enable vlm) \