Rename obsolete USE="v4l2" to USE="v4l" wrt #385241

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

3 files changed, 19 insertions, 17 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index ebbfdbdab1d4..01ca71afe885 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.646 2011/10/15 21:59:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.647 2011/10/30 15:57:51 ssuominen Exp $
+
+  30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> xine-lib-1.2.9999.ebuild:
+  Rename obsolete USE="v4l2" to USE="v4l" wrt #385241
 
 *xine-lib-1.2.9999 (15 Oct 2011)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index fbd80bdc5308..630f555e2c70 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xine-lib-1.1.19-ffmpeg.patch 12127 RMD160 2b70139da2f4832e3577a667c352257dcd610dcf SHA1 d70f14c3dbb59b65c581575fa1fe13aeeb38f1b1 SHA256 6ca05a1fbed6eeee19e822da2d789831c3f2593cb0d430385416ae170bc3c48f
 AUX xine-lib-1.1.19-xvmc.patch 485 RMD160 781a7fbc5dcc9f3c25de83625509fcce3950cca8 SHA1 f78834833e3aeb05f555688ab657ae05cd0691c7 SHA256 6be3ceb8edd7626e93c617de3068374dd638e1445c7308d88b24614e9bbceaf0
 DIST xine-lib-1.1.15-textrel-fix.patch 29373 RMD160 4702a26f42251614f5f6c99b4770f82da36577ae SHA1 e04d04dbd736fd17be8cf0583d47630850a89bf9 SHA256 1d6aa047cb0a13f248aea2e06e16b9758b9c39d8b7e42b32d0b52b424d26b33e
 DIST xine-lib-1.1.19.tar.xz 5782580 RMD160 7b8c2a4e5bcd0984414360d8d589aa533a9040f3 SHA1 f65f762d2e16adf04b9d715c91ee0bc02c322a7d SHA256 f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
 EBUILD xine-lib-1.1.19.ebuild 5675 RMD160 b34cf5a8030843ba98e7a90200e4c5e1518153e5 SHA1 d3ef71cc7ef26832f3bbe29d52416f0b22e047b6 SHA256 91daef9cfd2cd146646816e3f15eb5949ea4f8e7a5e05d639e5e621c4795c2da
-EBUILD xine-lib-1.2.9999.ebuild 5972 RMD160 8548f344b6b790b2ae57c0c05b40e7b62bb4213a SHA1 2e723fd391144af6a37c1072baac5cd295765b0a SHA256 7104729125f0190158f7762bbd29618a57bed9656dffe76a9047ca4d0caccb30
-MISC ChangeLog 75159 RMD160 4202f557521420ffb96cbfdae60383bf826d5573 SHA1 73009d148a404e698c9670a37bf173aa4c3a6d06 SHA256 b7c1874558eaf87cb2ae7f92de0bd8fc016fde92fd7c86a08aa184daba8b7d60
+EBUILD xine-lib-1.2.9999.ebuild 5941 RMD160 16a31f4a9853ff43e7a1177b9bada7f7e7e013a3 SHA1 3109b570d0ac0b31618125a53eb4112ebc63ccbc SHA256 f1fae26390892cff0c555046df0c50f14257a23bc81b86f2041b021d672c7c93
+MISC ChangeLog 75298 RMD160 c6da40b45660b93a7f9dc918ae2d5c2483b9ce4e SHA1 a94a168da098a1dd53eb49e1ee12aa794bc81c3e SHA256 832e1cf74c7dfa02caf6812096f298f59912f97ab807d295dc9655923f3a5481
 MISC metadata.xml 3698 RMD160 91204976d6b0b42d4ab62970cdd8e5218a3f1bd2 SHA1 762a24b480d6eec707bc3ad88321163e3b3c1155 SHA256 2f7c7abc6568e1c624f57923e63412e67d97918d051ac82b83357db40a0c24e5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCAAGBQJOmgJZAAoJEMOx0zmdw4Z1yU0H/2/CZtLimvO6iKQaq9wjLCRp
-nD7pq/YFXbd0vV6EL4blNajPJu/jDiKIdqF1tZ77gK3zkzdgz4zi/HiYwYa/Haa+
-V3qV0lr98FHk9bx+uYyNt3Lxyxxx7yZwtXzGFna0wqZTWZhVO8+HRTrxJumQdrwD
-UD5XDcIeUUS2geZt64/I6yQ6ZHeYlIA/5a7dQFFheWlnchanQRRFqz170r7CezcT
-B04T6G9CDijSia2FVp+KxvXc+BEfuvfcM5IuAthHuagSoZszM4iThiZQh7rUSw6R
-TMhlqVoGZ8yYwxeZmu6hVOecSVaKWKYBEznT664hRkvaXnGahlHQGF8RRamXCEo=
-=W8Hh
+iQEcBAEBAgAGBQJOrXQBAAoJEEdUh39IaPFNxncH/Aj0vWSpltSfGD0NbX9BNo+t
+brrhydTpYG+m58N2y44XgwEoL/9FbROrJIoGAcgBpY73wCuRJ96ps6o5pxJdVz/l
+bzGi52Io06Blq/pMoDYLYOPxibKKaNYUZzmiYiHkbNKdFC87JrQHaJcFTxP6VwhN
+2cKMBZLxakWt9bl/Fut5hkhJ5cK7IgORn1YeegmMoKA9UEZYMMz2rZi6MhUXbhMx
+kDcC/WjJbRX5wadNmCL55R+qLKhzZ3tMxSz14n93kxlLK31Q5yITSLoJxhZ2JE+q
+dKuOASEUIY3I9E3T4lav2udY95orEK/Oqv+tHDidKLlSowXRvZpP24ZHQq2HAQo=
+=baYm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 6e767ee9b628..dac643f65617 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.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-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.1 2011/10/15 21:59:42 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.9999.ebuild,v 1.2 2011/10/30 15:57:51 ssuominen Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ KEYWORDS=""
 IUSE="a52 aac aalib alsa altivec antialiasing asf directfb dts debug dvb dxr3
 esd fbcon flac fontconfig fusion gdk-pixbuf glu gnome imagemagick ipv6 jack
 real libcaca libv4l mad mmap mng modplug musepack nls nosefart opengl oss pulseaudio
-samba sdl speex static-libs theora truetype v4l v4l2 vcd vdpau vdr vidix vis vorbis
+samba sdl speex static-libs theora truetype v4l vcd vdpau vdr vidix vis vorbis
 wavpack win32codecs X xcb xinerama xv xvmc"
 
 REQUIRED_USE="fontconfig? ( truetype )
@@ -85,7 +85,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( virtual/libintl )
 	v4l? ( virtual/os-headers )
-	v4l2? ( virtual/os-headers )
 	oss? ( virtual/os-headers )
 
 	X? ( x11-proto/xproto
@@ -150,8 +149,8 @@ src_configure() {
 		$(use_enable dvb) \
 		$(use_enable gnome gnomevfs) \
 		$(use_enable samba) \
-		$(use_enable v4l) \
-		$(use_enable v4l2) \
+		--disable-v4l \
+		$(use_enable v4l v4l2) \
 		$(use_enable libv4l) \
 		$(use_enable vcd) \
 		$(use_enable vdr) \