diff options
| author |   Ole Markus With <olemarkus@gentoo.org> | 2010-10-08 19:09:25 +0000 |
|---|---|---|
| committer | Ole Markus With <olemarkus@gentoo.org> | 2010-10-08 19:09:25 +0000 |
| commit | fa082566b0f470b5502abd87aaaadfec04529070 (patch) | |
| tree | 2922cdbdfb786b02236a3b34600132a34a8ec19e /profiles | |
| parent | Masked dev-php5/pecl-memcache-3.0.5-r1 for testing (diff) | |
| download | historical-fa082566b0f470b5502abd87aaaadfec04529070.tar.gz historical-fa082566b0f470b5502abd87aaaadfec04529070.tar.bz2 historical-fa082566b0f470b5502abd87aaaadfec04529070.zip | |
Added PHP_TARGETS to USE_EXPAND
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 8 | ||||
| -rw-r--r-- | profiles/base/make.defaults | 4 | ||||
| -rw-r--r-- | profiles/desc/php_targets.desc | 8 |
3 files changed, 17 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index a08d969c5543..396371e27834 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4637 2010/10/08 19:02:13 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4638 2010/10/08 19:09:25 olemarkus 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! + + + 08 Oct 2010; Ole Markus With <olemarkus@gentoo.org> + base/make.defaults,desc/php_targets.desc: + Added PHP_TARGETS to USE_EXPAND + 08 Oct 2010; Ole Markus With <olemarkus@gentoo.org> package.mask: Masked dev-php/pecl-memcache-3.0.5-r1 for testing diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 776ea4c4cd8b..96cfe95cfbff 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -1,13 +1,13 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.56 2010/09/28 14:58:32 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.57 2010/10/08 19:09:25 olemarkus 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 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 NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS" +USE_EXPAND="APACHE2_MODULES APACHE2_MPMS 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" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. diff --git a/profiles/desc/php_targets.desc b/profiles/desc/php_targets.desc new file mode 100644 index 000000000000..39a4c66dcb11 --- /dev/null +++ b/profiles/desc/php_targets.desc @@ -0,0 +1,8 @@ +# Copyright 2009 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/desc/php_targets.desc,v 1.1 2010/10/08 19:09:25 olemarkus Exp $ + +# This file contains descriptions of the PHP_TARGETS USE_EXPAND flags + +php5-3 - Build against PHP 5.3 +php5-2 - Build against PHP 5.2 |