Add VOICEMAIL_STORAGE to USE_EXPAND for net-misc/asterisk; approved by Ian "axs" Stakenvicius on gentoo-dev.

3 files changed, 18 insertions, 3 deletions

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index c8642f1e458f..19dae7925766 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.408 2012/06/19 14:27:26 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.409 2012/06/22 10:33:10 chainsaw Exp $
+
+  22 Jun 2012; Tony Vroon <chainsaw@gentoo.org> make.defaults:
+  Add VOICEMAIL_STORAGE to USE_EXPAND for net-misc/asterisk; approved by Ian
+  "axs" Stakenvicius on gentoo-dev.
 
   19 Jun 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   package.use.mask:
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 3c2a184b3cf1..1527b85eac78 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,13 +1,13 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.82 2012/05/25 19:12:52 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.83 2012/06/22 10:33:10 chainsaw Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@gentoo.org.
-USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES 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 NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS"
+USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES 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 NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
diff --git a/profiles/desc/voicemail_storage.desc b/profiles/desc/voicemail_storage.desc
new file mode 100644
index 000000000000..645047cedc52
--- /dev/null
+++ b/profiles/desc/voicemail_storage.desc
@@ -0,0 +1,11 @@
+# Copyright 2006 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/voicemail_storage.desc,v 1.1 2012/06/22 10:33:10 chainsaw Exp $
+
+# This file contains descriptions of VOICEMAIL_STORAGE USE_EXPAND flags.
+# This is primarily used by net-misc/asterisk.
+
+# Keep it sorted.
+file - Uses plain files to store configuration & messages.
+odbc - Uses ODBC to talk to a SQL database backend.
+imap - Uses an IMAP server to store configuration & messages.