Added CAMERAS USE_EXPAND bug#139884

3 files changed, 60 insertions, 3 deletions

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 84308a5bf0e6..baf661985e0a 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.3 2007/01/22 07:23:51 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.4 2007/01/27 16:09:33 alonbl Exp $
+
+  27 Jan 2007; Alon Bar-Lev <alonbl@gentoo.org> make.defaults:
+  Added CAMERAS USE_EXPAND bug#139884
 
   22 Jan 2007; Christian Faulhammer <opfer@gentoo.org> use.mask:
   masked bmpx USE flag in order to stable conky
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 7e2d4a0e0f33..49608af7065c 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.31 2007/01/17 00:52:45 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.32 2007/01/27 16:09:33 alonbl Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -10,7 +10,7 @@ FEATURES="autoconfig strict sfperms"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES"
+USE_EXPAND="FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
diff --git a/profiles/desc/cameras.desc b/profiles/desc/cameras.desc
new file mode 100644
index 000000000000..149d72252bf0
--- /dev/null
+++ b/profiles/desc/cameras.desc
@@ -0,0 +1,54 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/cameras.desc,v 1.1 2007/01/27 16:09:33 alonbl Exp $
+
+# This file contains descriptions of CAMERAS USE_EXPAND flags.
+
+# Keep it sorted.
+
+adc65 - libgphoto support for adc65 cameras
+agfa-c120 - libgphoto support for agfa-c120 cameras
+aox - libgphoto support for aox cameras
+aox - libgphoto support for aox cameras
+barbie - libgphoto support for barbie cameras
+canoncameras_casio - libgphoto support for canoncameras_casio cameras
+clicksmart310 - libgphoto support for clicksmart310 cameras
+digigr8 - libgphoto support for digigr8 cameras
+digita - libgphoto support for digita cameras
+dimera - libgphoto support for dimera cameras
+directory - libgphoto support for directory cameras
+enigmal3 - libgphoto support for enigmal3 cameras
+fuji - libgphoto support for fuji cameras
+gsmart300 - libgphoto support for gsmart300 cameras
+hp215 - libgphoto support for hp215 cameras
+iclick - libgphoto support for iclick cameras
+jamcam - libgphoto support for jamcam cameras
+jdll - libgphoto support for jdll cameras
+kodak - libgphoto support for kodak cameras
+konica - libgphoto support for konica cameras
+largan - libgphoto support for largan cameras
+lg_gsm - libgphoto support for lg_gsm cameras
+mars - libgphoto support for mars cameras
+minolta - libgphoto support for minolta cameras
+mustek - libgphoto support for mustek cameras
+panasonic - libgphoto support for panasonic cameras
+pccam300 - libgphoto support for pccam300 cameras
+pccam600 - libgphoto support for pccam600 cameras
+polaroid - libgphoto support for polaroid cameras
+ptp2 - libgphoto support for ptp2 cameras
+ricoh - libgphoto support for ricoh cameras
+samsung - libgphoto support for samsung cameras
+sierra - libgphoto support for sierra cameras
+sipix - libgphoto support for sipix cameras
+small - libgphoto support for small cameras
+sonix - libgphoto support for sonix cameras
+sonydscfl - libgphoto support for sonydscfl cameras
+sonydscf55 - libgphoto support for sonydscf55 cameras
+soundvision - libgphoto support for soundvision cameras
+spca50x - libgphoto support for spca50x cameras
+sq905 - libgphoto support for sq905 cameras
+stv0674 - libgphoto support for stv0674 cameras
+stv0680 - libgphoto support for stv0680 cameras
+sx330x - libgphoto support for sx330x cameras
+template - libgphoto support for template cameras
+toshiba - libgphoto support for toshiba cameras