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

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

8 files changed, 57 insertions, 45 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index c52e827aba7a..a5f1463bdbc7 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.30 2011/10/07 11:18:25 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.31 2011/11/01 00:45:41 ssuominen Exp $
+
+  01 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> libav-0.6.2.ebuild,
+  libav-0.6.9999.ebuild, libav-0.7.2.ebuild, libav-0.7.9999.ebuild,
+  libav-0.8_pre20110818.ebuild, libav-9999.ebuild:
+  Rename USE="v4l2" to USE="v4l" while removing support for video4linux 1.x wrt
+  #385241
 
   07 Oct 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -libav-0.7_pre20110327.ebuild, -libav-0.7.ebuild, -libav-0.7.1.ebuild:
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 73052d7b071d..8728c72cba46 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -6,28 +6,22 @@ AUX 0.6.2-float_arrays.patch 1611 RMD160 960188d97261729526187c53a281a03c31a6a95
 DIST libav-0.6.2.tar.bz2 3639862 RMD160 fbdee25614940253e018e42a633da579704146fd SHA1 b79dc56a08f4ef07b41d1a78b2251f21fde8b81d SHA256 eb13f20bfa09664559e81ff9691cebcb77a763320ddf63c47a402351409697af
 DIST libav-0.7.2.tar.xz 3573280 RMD160 5f41d42375e66e681ac99b0183825ddc4f09b70d SHA1 938c52f122030a797e9c9ba5cab6a7cb812cd9d7 SHA256 450999ed097b0814247f44be1321c4997aee49d56cab6636b0a7257e13ba2729
 DIST libav-0.8_pre20110818.tar.xz 3588912 RMD160 ad289ef01a762fe1141a4a6db647006f98b82e98 SHA1 8d669f211edb11ca9504dc56fff3f2292b5da692 SHA256 00612c08a723cfa9885335e45db6c0083efd17229cbffeb67c5849443617f68d
-EBUILD libav-0.6.2.ebuild 7533 RMD160 1bddb36b6993fffbb60f99720746eb0bef479099 SHA1 f89c1bec58f536e13d040a2ebb352216765e41e3 SHA256 9f4beecf6b25c7d99c34cdc17081002d737bff08f6a62c118db30730d051d594
-EBUILD libav-0.6.9999.ebuild 7482 RMD160 f58198eafac144299b27e26f272329342cffb170 SHA1 f1246c93f36e1e10c133aa243c6d87e8b09af45e SHA256 696b08f45058c0383b3c0e9a74fe8e7d2f96bbfa87914ccc2ac912af4dc793ec
-EBUILD libav-0.7.2.ebuild 7926 RMD160 c83b0e2367396f1a204a8a78a6036994fae52857 SHA1 6ae657f10738d3e39d06c5fb9c310549ca9b4fba SHA256 9a78d5cbc739460cd1499fbd1c6daf6498129d932b11998a8fe436015bbd51b0
-EBUILD libav-0.7.9999.ebuild 7877 RMD160 709893a83b97100e838189bc02ea2da2126a0902 SHA1 e4636b730d92f9b4e0f60147ee6affb8c41c087d SHA256 2c3fa367dca324e2607aa9201bdf084c1e394564ee7c0e26031a88ded9c1d501
-EBUILD libav-0.8_pre20110818.ebuild 8292 RMD160 5b9396cc254b3eaa00c61b35962411b7c2449651 SHA1 8e176495c1edb42d5d703c95bc356ecb2c552e26 SHA256 638de98830ee7e6a3a86049013d30bff97f731a6ac749e3d1db66f6a25d7645d
-EBUILD libav-9999.ebuild 8317 RMD160 06edda7c3990ca02c18f176eb721d813e64d2714 SHA1 1c660490920fd3b7327c15df6691c362dd291aca SHA256 2e6ca4cf8ac61681fb179d3906fc2e3da79e9c2d68b8f4214a666aff152e054f
-MISC ChangeLog 4975 RMD160 b16f6311c46597d8e09cce9b5c0078e208c0a13f SHA1 d9a9a30bb6b207897ebb640ffb300c1752913dc6 SHA256 780f457fb774d99d70b75dc2cce7851dea846de54b7744ffe6f8e72e7bb5563f
+EBUILD libav-0.6.2.ebuild 7602 RMD160 69343b32c466f2ab343e7c6df95b8828a9bbc487 SHA1 c4bec403c0ddc2c7aabcf4a74b69a8a51cac5d12 SHA256 89ae504daa8e22b6d1685f0636738c57619bb382cb8932e6deed83e1d3fd23bd
+EBUILD libav-0.6.9999.ebuild 7551 RMD160 b939f2a68e9bd9a7da4811c56432fba92c8e415a SHA1 7e1262552041497a468b688b0671eb6dafb49ebb SHA256 66c39427dd364636ae0137db31dd256d5a18dc2d1455086c8c8115664051bea7
+EBUILD libav-0.7.2.ebuild 7997 RMD160 ffe4f995d2effccc27489b94589429684dab461f SHA1 a10ee4c1597be2f21715bda28718adf7bfa58118 SHA256 6f55a7e9e5e49767ff25740b29a5f61ced41f0eb518096e5dae9644bf02250db
+EBUILD libav-0.7.9999.ebuild 7947 RMD160 a67ea8d26ccffe866e4a3edc11076da4ad53d5e6 SHA1 d297581ec2cbb9e1a71199164f6107582d765686 SHA256 cb3fe767d8a836d758355daab4a20865d21cde3f8efd7480025d3b638ee5c9bd
+EBUILD libav-0.8_pre20110818.ebuild 8363 RMD160 819a6683c1a974e05423e90bc7b673c0efe69300 SHA1 d9d54bcf788aff84b612346d8061b729031cad1d SHA256 6592548fd9b633acfcae1686da5377743730c200b414fbb95574c6dd5ca5cd97
+EBUILD libav-9999.ebuild 8388 RMD160 5decb92a1d414047cf00c6c2a473543dfaaa760b SHA1 8f635fe48614db3c230cfcb9a8829bef59b589a2 SHA256 2645599a6e9390b61e7409260afe3a5ac3b7b119442d894c5be7bc376f768a69
+MISC ChangeLog 5259 RMD160 9311cd042fb914019bb35fed09f1f280fc939f74 SHA1 58ca3bf26a295019c49682be0b85337ac1cd5d62 SHA256 ac53e68d8f29c35a20098a22d42c481da8ce5ee13907cb41ce596f0cacc87241
 MISC metadata.xml 2343 RMD160 beadccfc0b455869a2810504ee185f622de04961 SHA1 421b87ca6c05fbde61a429dee1c90dcb88e7751a SHA256 daf4da36c94dbd7dd4e44dc643dda9420bafcec1824014ecdcb5c9067d5096b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOjt/cAAoJEOSiRoyO7jvoojQP/27nuFxIQFqF4zyf9Cpg38K3
-XMgjK1TmM+nYaZa6XZAxqLgjSn8w6GXic0M3EqvyxqCAAvxOMu5PbkNaOvflzU4W
-0hqnACIh/jrBdTmOIr9uIMkIpj/gIUzvYjuldVtsJ0a02RvAnRTCkciNv5fwRUUy
-otU0zN84afsLHOZgTnIxNnPAKRyMQ6elVt4hozi5PYIlUsTWD4gS7w9ETClgfw6K
-oELdUrrTTr3ZVxhSP5Hwgu8JAffgyYF/4CWde4qtg3v6hB2mqry4+gvjWRDgyPFu
-aXxGvTXfoATEcTybjuOjw0sm8U1rm0XwL/yvv3kuyum+Bs1nagAYfvZBtys/3zE7
-CTDXAlgNLzY8H2Z3QG2MyvbuncyLCrE5NRtoyW+meNMK44B2nK3xJ5Hp0Br1feVF
-ZDmhVT1VuOzOm33/wr2CVyiU04fQO+SyIoDWdPtf5KQJ3vOLDosNFzWLc+HPo5mB
-mmVUXK7vmfRntmiZTgGuohTgOD45QA6r2D1gGXnh+p4VFsO0hKQTJWpwFzKVlpm7
-ORPC/JYNevMmi+82KWhK5xC1wwjrTis0SY1DJNsYLLsgPBQpZcXwQjb40VMuVXEV
-4Wuax2Ah1Ul9h6afqNds9gvDOQvjvKSeJyLjEx1e2FhDG7vZzHOHVtqlamVgdPXZ
-7kBYiQCsxS+meMfTq0gs
-=k8hs
+iQEcBAEBAgAGBQJOr0EwAAoJEEdUh39IaPFNEYIIAJPw8TCmfF05/bJSni7G/mCf
+2n/fAnjQzx9iLgAXEqw2UwBa19aasO24QYTACeC6FOVoax0aEMD+NoYSPLpnq7uK
+ZUUwme72vBHNpxFII/o7QKXOwVybI5xtEfIMAwyDc3LF84aeyhlnk6ZyVOmjXWYe
+NvJr32KTyaWfvKZxMAIiOGCkrglpZo9Q2NtJYTX+pqmdku8905yzxRoFpRbmLKUE
+K6PMImfHGAQLGujkLv6DmLuSKUPazyGYPrEDdMurSEauctvILqPVu2BqAI4+MU1E
+gKDzNMEem2VmnG+JLNGriKC6xFYqDw0HK9pSB2JBWY9DyJOYwddLH9sODlQ5OuU=
+=p6l4
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.6.2.ebuild b/media-video/libav/libav-0.6.2.ebuild
index 9ab1b8192cdf..dc8ff8b4f7a4 100644
--- a/media-video/libav/libav-0.6.2.ebuild
+++ b/media-video/libav/libav-0.6.2.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/libav/libav-0.6.2.ebuild,v 1.4 2011/04/01 09:45:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.2.ebuild,v 1.5 2011/11/01 00:45:41 ssuominen Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -71,7 +71,6 @@ DEPEND="${RDEPEND}
 	schroedinger? ( dev-util/pkgconfig )
 	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 
 # faac can't be binary distributed
@@ -124,7 +123,10 @@ src_configure() {
 	# libavdevice options
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=" --disable-indev=v4l"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
diff --git a/media-video/libav/libav-0.6.9999.ebuild b/media-video/libav/libav-0.6.9999.ebuild
index 7eacef9fb097..5272622d5c6e 100644
--- a/media-video/libav/libav-0.6.9999.ebuild
+++ b/media-video/libav/libav-0.6.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/libav/libav-0.6.9999.ebuild,v 1.7 2011/04/20 11:01:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.9999.ebuild,v 1.8 2011/11/01 00:45:41 ssuominen Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -72,7 +72,6 @@ DEPEND="${RDEPEND}
 	schroedinger? ( dev-util/pkgconfig )
 	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 
 # faac can't be binary distributed
@@ -121,7 +120,10 @@ src_configure() {
 	# libavdevice options
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=" --disable-indev=v4l"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
diff --git a/media-video/libav/libav-0.7.2.ebuild b/media-video/libav/libav-0.7.2.ebuild
index dd81a869f7b5..4d46b8bea950 100644
--- a/media-video/libav/libav-0.7.2.ebuild
+++ b/media-video/libav/libav-0.7.2.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/libav/libav-0.7.2.ebuild,v 1.2 2011/10/03 07:39:42 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.2.ebuild,v 1.3 2011/11/01 00:45:41 ssuominen Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
 	schroedinger? ( dev-util/pkgconfig )
 	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 
 # faac can't be binary distributed
@@ -140,7 +139,10 @@ src_configure() {
 	# libavdevice options
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=" --disable-indev=v4l"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
diff --git a/media-video/libav/libav-0.7.9999.ebuild b/media-video/libav/libav-0.7.9999.ebuild
index fd403a3bdb8a..92cdb3214427 100644
--- a/media-video/libav/libav-0.7.9999.ebuild
+++ b/media-video/libav/libav-0.7.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/libav/libav-0.7.9999.ebuild,v 1.2 2011/07/21 21:38:10 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.3 2011/11/01 00:45:41 ssuominen Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
 	schroedinger? ( dev-util/pkgconfig )
 	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 
 # faac can't be binary distributed
@@ -137,7 +136,10 @@ src_configure() {
 	# libavdevice options
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=" --disable-indev=v4l"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
diff --git a/media-video/libav/libav-0.8_pre20110818.ebuild b/media-video/libav/libav-0.8_pre20110818.ebuild
index ad4d0bedbc89..0ab9d8bc3123 100644
--- a/media-video/libav/libav-0.8_pre20110818.ebuild
+++ b/media-video/libav/libav-0.8_pre20110818.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/libav/libav-0.8_pre20110818.ebuild,v 1.3 2011/08/18 09:40:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8_pre20110818.ebuild,v 1.4 2011/11/01 00:45:41 ssuominen Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
 	schroedinger? ( dev-util/pkgconfig )
 	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 
 # faac can't be binary distributed
@@ -138,7 +137,10 @@ src_configure() {
 	# libavdevice options
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=" --disable-indev=v4l"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 5564168fbd02..17de0ffe2733 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-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/libav/libav-9999.ebuild,v 1.17 2011/09/22 18:47:03 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.18 2011/11/01 00:45:41 ssuominen Exp $
 
 EAPI=4
 
@@ -27,7 +27,7 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
 	schroedinger? ( dev-util/pkgconfig )
 	test? ( net-misc/wget )
 	v4l? ( sys-kernel/linux-headers )
-	v4l2? ( sys-kernel/linux-headers )
 "
 
 # faac can't be binary distributed
@@ -140,7 +139,10 @@ src_configure() {
 	# libavdevice options
 	use ieee1394 && myconf+=" --enable-libdc1394"
 	# Indevs
-	for i in v4l v4l2 alsa oss jack; do
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=" --disable-indev=v4l"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
 		use ${i} || myconf+=" --disable-indev=${i}"
 	done
 	use X && myconf+=" --enable-x11grab"