summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/use.desc6
2 files changed, 7 insertions, 4 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b8c4eaeeb882..b71d7dd2e703 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5739 2011/09/30 19:50:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5740 2011/09/30 20:01:51 ssuominen Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> use.desc:
+ Fix USE="v4l" and USE="v4l2" description.
+
30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> package.mask:
Remove entries for pkgs removed because of not building against
linux-headers-2.6.38.
diff --git a/profiles/use.desc b/profiles/use.desc
index b7b3991bb773..94717748b6e0 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -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/profiles/use.desc,v 1.464 2011/09/28 10:52:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/use.desc,v 1.465 2011/09/30 20:01:51 ssuominen Exp $
# Keep them sorted
@@ -365,8 +365,8 @@ uclibc - Enable uclibc specific patches and build or link uclibc
udev - Enable sys-fs/udev integration (device discovery, power and storage device support, etc)
unicode - Adds support for Unicode
usb - Adds USB support to applications that have optional USB support (e.g. cups)
-v4l - Enables video4linux support
-v4l2 - Enable video4linux2 support
+v4l - Enable support for video4linux (libv4l or v4l2 from sys-kernel/linux-headers)
+v4l2 - Enable support for video4linux (DEPRECATED: Use USE v4l for your package to enable v4l2 or libv4l support)
vanilla - Do not add extra patches which change default behaviour; DO NOT USE THIS ON A GLOBAL SCALE as the severity of the meaning changes drastically
vcd - Video CD support
vhosts - Adds support for installing web-based applications into a virtual-hosting environment