v4l2 is now automaticaly built upstream if headers are present, drop the useflag

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

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 374895041e1cea9ea940d796467ce54da6e57585..c98513cef3691d54f3adccd23d5d3e26de54e4c7 100644 (file)
--- 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.737 2011/09/08 04:52:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.738 2011/09/08 18:16:38 aballier Exp $
+
+  08 Sep 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
+  v4l2 is now automaticaly built upstream if headers are present, drop the
+  useflag
 
   08 Sep 2011; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
   fix build of -9999 after recent changes

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6d19e87ac67c61c949d5fa3476b23152651ff47c..849607d7d605f3a10b4df6013bb771e451a96684 100644 (file)
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -6,13 +6,13 @@ DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a73
 DIST vlc-patches-99.tar.bz2 3353 RMD160 5e4961b7a6036ddcd609af1ce001f9be8cd6e525 SHA1 b26e969bcf05751fc0fe2ffd17b5be03d7a184aa SHA256 79b68b6879b737a714075d2437a7615525242412f7cf084277ace2cbeec567e9
 EBUILD vlc-1.1.11.ebuild 12378 RMD160 dab6507d8de996c819c8a1add5b33ae43f342294 SHA1 50479218dfb33eab93d02aa6f1f25edec1655fd0 SHA256 bbbbd8f423d66b6b90950fc2074103c70f5a6afa53710c6db7e8d5086c890b71
 EBUILD vlc-1.1.9999.ebuild 12388 RMD160 c134c5e8ab5d04d483394ec3c035b6e5c03842f4 SHA1 940fbd8a150863f8719b0d28ffadbf02efdd365d SHA256 138353178b78cf45acc1a80e264ab4828046ce6d3adf9e9d9baa0ada97cab475
-EBUILD vlc-9999.ebuild 10981 RMD160 05d1cc174f22cf9b018e3e838b9b5d2de4dd0cfa SHA1 cc8b8454d3345df0ff943673592fb040ba555749 SHA256 8df4f2a9089f135c072caef6b8084c7620981e1a8f60b766a035bdfbabffde4b
-MISC ChangeLog 109632 RMD160 14f903950b5fcd934a9d0df7d582b6b4a7f83daf SHA1 96407a3f70145707af00568bd8f04116679a9db8 SHA256 96fdee046996ac7c1ef14c53f9ce4ed8b83e26e32e5f3c717e325a4b3dc50506
+EBUILD vlc-9999.ebuild 10889 RMD160 d0cd560bc0e8fc80a71d495629d3f0b6cb17f163 SHA1 fd6408548373f5279b205d34ac02877c60eaf445 SHA256 58164c53c3dec249523e4c73796d979245f55c165f02a65915ae3bcb2f723dbb
+MISC ChangeLog 109787 RMD160 d4f68ed45f273bcef8402c5a9de5aed5ea73e514 SHA1 b3e94222fad9eeae279524a3a07c7d0895b1b37e SHA256 05fa6a6f6f22791712c5c8426fda95a973138c98f54cbf72c0d3d875fd4f854c
 MISC metadata.xml 6478 RMD160 7ddf32170a0d306d753eb1c567bab738871f93ee SHA1 fc20ca23fbef32370d86fdaa1154d5eb744ca6a2 SHA256 c72d228750d1d28196388c2bedc79de711a14e0c1c664eaedbb1ad63467955f8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5oShYACgkQvFcC4BYPU0rFMgCggAXn8JuHt6GYssZCHenzBewo
-hVQAn3buCxlB5qly7zq2Odg/ictRmGhp
-=PgeY
+iEYEARECAAYFAk5pBowACgkQvFcC4BYPU0oExwCfRNEXFbpy1GlSEQHrxsk5HHhI
+uyMAoKbZ5aoUvR0KvSq3ywwI5+Y61SC7
+=Q4vS
 -----END PGP SIGNATURE-----

diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 27aaead114e0177fd8c9230a18a491d2a57c76b5..c9d27fa9de48e2f6bcde1e3eb870cfa6bcea7527 100644 (file)
--- 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.145 2011/09/08 04:52:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.146 2011/09/08 18:16:38 aballier Exp $
 
 EAPI="4"
 
@@ -56,7 +56,7 @@ IUSE="a52 aac aalib alsa altivec atmo +audioqueue avahi +avcodec
        ncurses neon ogg omxil opengl optimisememory oss png portaudio +postproc
        projectm pulseaudio pvr +qt4 rtsp run-as-root samba schroedinger sdl
        sdl-image shine shout sid skins speex sqlite sse svg +swscale
-       switcher taglib theora truetype twolame udev upnp v4l2 vaapi vcdx vlm vorbis
+       switcher taglib theora truetype twolame udev upnp vaapi vcdx vlm vorbis
        waveout win32codecs wingdi wma-fixed +X x264 +xcb xml xosd xv zvbi"
 
 RDEPEND="
@@ -151,7 +151,6 @@ DEPEND="${RDEPEND}
        alsa? ( >=media-sound/alsa-headers-1.0.23 )
        fbosd? ( sys-kernel/linux-headers )
        kde? ( >=kde-base/kdelibs-4 )
-       v4l2? ( >=sys-kernel/linux-headers-2.6.25 )
        xcb? ( x11-proto/xproto )
        dev-util/pkgconfig"
 
@@ -166,7 +165,6 @@ REQUIRED_USE="
        gnutls? ( gcrypt )
        libtar? ( skins )
        libtiger? ( kate )
-       libv4l2? ( v4l2 )
        media-library? ( sqlite )
        qt4? ( X )
        sdl? ( X )
@@ -308,7 +306,6 @@ src_configure() {
                $(use_enable twolame) \
                $(use_enable udev) \
                $(use_enable upnp) \
-               $(use_enable v4l2) \
                $(use_enable vcdx) \
                $(use_enable vaapi libva) \
                $(use_enable vlm) \