diff options
31 files changed, 201 insertions, 25 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 6b75f1d2840a..5e53fcabd44c 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -1,9 +1,14 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.5 2005/04/16 08:17:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.6 2005/04/23 03:40:13 jstubbs Exp $ # # System-wide defaults for the Portage system # See portage(5) manpage # Have everyone update config.{sub,guess} by default FEATURES="autoconfig strict" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" diff --git a/profiles/cobalt-mips-1.4/make.defaults b/profiles/cobalt-mips-1.4/make.defaults index 49ddd6a1aaf4..da0f640f58af 100644 --- a/profiles/cobalt-mips-1.4/make.defaults +++ b/profiles/cobalt-mips-1.4/make.defaults @@ -27,3 +27,9 @@ CXXFLAGS=${CFLAGS} USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts" ACCEPT_KEYWORDS="mips" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/cobalt-mips-2004.1/make.defaults b/profiles/cobalt-mips-2004.1/make.defaults index 49ddd6a1aaf4..da0f640f58af 100644 --- a/profiles/cobalt-mips-2004.1/make.defaults +++ b/profiles/cobalt-mips-2004.1/make.defaults @@ -27,3 +27,9 @@ CXXFLAGS=${CFLAGS} USE="bitmap-fonts slang readline gpm berkdb font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts" ACCEPT_KEYWORDS="mips" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-alpha-1.4/make.defaults b/profiles/default-alpha-1.4/make.defaults index 2ba097f62d86..33aec84ef68e 100644 --- a/profiles/default-alpha-1.4/make.defaults +++ b/profiles/default-alpha-1.4/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.16 2005/03/09 00:35:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-1.4/make.defaults,v 1.17 2005/04/23 03:40:13 jstubbs Exp $ USE=" alpha @@ -54,3 +54,9 @@ zlib ARCH="alpha" ACCEPT_KEYWORDS="alpha" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-alpha-2004.0/make.defaults b/profiles/default-alpha-2004.0/make.defaults index ff26a4c98ede..a502d8d13bd1 100644 --- a/profiles/default-alpha-2004.0/make.defaults +++ b/profiles/default-alpha-2004.0/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.10 2005/03/09 00:35:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-alpha-2004.0/make.defaults,v 1.11 2005/04/23 03:40:13 jstubbs Exp $ # System-wide defaults for the Portage system on alpha #Experimental: trying to use these USE variables to build up from stage 2->3 @@ -69,3 +69,9 @@ zlib ARCH="alpha" ACCEPT_KEYWORDS="alpha" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-amd64-2004.2/make.defaults b/profiles/default-amd64-2004.2/make.defaults index 333dc2727806..d370e0d15beb 100644 --- a/profiles/default-amd64-2004.2/make.defaults +++ b/profiles/default-amd64-2004.2/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.10 2005/03/09 00:35:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-amd64-2004.2/make.defaults,v 1.11 2005/04/23 03:40:13 jstubbs Exp $ # System-wide defaults for the gcc 3.3 Portage system #Experimental: trying to use these USE variables to build up from stage 2->3 @@ -21,3 +21,9 @@ CXXFLAGS="${CFLAGS}" # sure the user has a 32bit sandbox! it only gets installed if you add multilib # to use, recompile gcc, and then recompile portage. :/ FEATURES="-sandbox" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-macos-10.3/make.defaults b/profiles/default-macos-10.3/make.defaults index 71dcab633b80..742ff0bea47b 100644 --- a/profiles/default-macos-10.3/make.defaults +++ b/profiles/default-macos-10.3/make.defaults @@ -15,3 +15,9 @@ USE="" PLATFORM=$CHOST FETCHCOMMAND="/usr/bin/curl --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-macos-10.4/make.defaults b/profiles/default-macos-10.4/make.defaults index 7381805ec567..eb70760da39a 100644 --- a/profiles/default-macos-10.4/make.defaults +++ b/profiles/default-macos-10.4/make.defaults @@ -15,3 +15,8 @@ USE="" PLATFORM=$CHOST FETCHCOMMAND="/usr/bin/curl --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" diff --git a/profiles/default-mips-1.4/make.defaults b/profiles/default-mips-1.4/make.defaults index 9a450712c949..09623cd17414 100644 --- a/profiles/default-mips-1.4/make.defaults +++ b/profiles/default-mips-1.4/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.11 2005/03/09 00:35:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-1.4/make.defaults,v 1.12 2005/04/23 03:40:13 jstubbs Exp $ # System-wide defaults for the Portage system ARCH="mips" @@ -25,3 +25,9 @@ CXXFLAGS=${CFLAGS} USE="bitmap-fonts slang readline gpm berkdb fortran font-server gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts" ACCEPT_KEYWORDS="mips" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-mips-2004.1/make.defaults b/profiles/default-mips-2004.1/make.defaults index 2ce5628062d8..9502c29419f9 100644 --- a/profiles/default-mips-2004.1/make.defaults +++ b/profiles/default-mips-2004.1/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.9 2005/03/09 00:35:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips-2004.1/make.defaults,v 1.10 2005/04/23 03:40:13 jstubbs Exp $ # System-wide defaults for the Portage system ARCH="mips" @@ -25,3 +25,9 @@ CXXFLAGS=${CFLAGS} USE="bitmap-fonts slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts" ACCEPT_KEYWORDS="mips" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-mips64-1.4/make.defaults b/profiles/default-mips64-1.4/make.defaults index e9660e8bf40e..ef28ccb1d85f 100644 --- a/profiles/default-mips64-1.4/make.defaults +++ b/profiles/default-mips64-1.4/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.9 2005/03/09 00:35:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-mips64-1.4/make.defaults,v 1.10 2005/04/23 03:40:13 jstubbs Exp $ # System-wide defaults for the Portage system ARCH="mips" @@ -26,3 +26,9 @@ CXXFLAGS=${CFLAGS} USE="bitmap-fonts slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls perl python sdl mips truetype-fonts type1-fonts" ACCEPT_KEYWORDS="mips" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc-1.0/make.defaults b/profiles/default-ppc-1.0/make.defaults index d4e3e5acec36..11a9c6f23cd6 100644 --- a/profiles/default-ppc-1.0/make.defaults +++ b/profiles/default-ppc-1.0/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.15 2005/03/09 00:35:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.0/make.defaults,v 1.16 2005/04/23 03:40:13 jstubbs Exp $ # System-wide defaults for the Portage system ARCH="ppc" @@ -29,3 +29,9 @@ USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm # 3dfx 3dnow avi icc icc-pgo mmx svga sse nas ACCEPT_KEYWORDS="ppc" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc-1.4/make.defaults b/profiles/default-ppc-1.4/make.defaults index c1d3b7aaccc7..127ace011548 100644 --- a/profiles/default-ppc-1.4/make.defaults +++ b/profiles/default-ppc-1.4/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.22 2005/03/09 00:35:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-1.4/make.defaults,v 1.23 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" @@ -31,3 +31,9 @@ USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm # 3dfx 3dnow avi icc icc-pgo mmx svga sse ACCEPT_KEYWORDS="ppc" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc-2004.0/make.defaults b/profiles/default-ppc-2004.0/make.defaults index b1c2d4bb9169..c7582c9a5d29 100644 --- a/profiles/default-ppc-2004.0/make.defaults +++ b/profiles/default-ppc-2004.0/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.0/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # Gentoo Linux PowerPC system defaults ACCEPT_KEYWORDS="ppc" @@ -12,3 +12,9 @@ FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}" MAKEOPTS="-j2" PLATFORM=$CHOST USE="dvd jpeg nls gif png truetype ppc fortran" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc-2004.1/make.defaults b/profiles/default-ppc-2004.1/make.defaults index 92e6d11d55a8..744bf16ce9ca 100644 --- a/profiles/default-ppc-2004.1/make.defaults +++ b/profiles/default-ppc-2004.1/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.1/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # Gentoo Linux PowerPC system defaults ACCEPT_KEYWORDS="ppc" @@ -12,3 +12,9 @@ FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}" MAKEOPTS="-j2" PLATFORM=$CHOST USE="dvd jpeg nls gif png truetype ppc fortran" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc-2004.2/make.defaults b/profiles/default-ppc-2004.2/make.defaults index bfe694adbfcf..ca0c35e8de69 100644 --- a/profiles/default-ppc-2004.2/make.defaults +++ b/profiles/default-ppc-2004.2/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.2/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # Gentoo Linux PowerPC system defaults ACCEPT_KEYWORDS="ppc" @@ -12,3 +12,9 @@ FETCHCOMMAND="/usr/bin/wget -t 5 --passive-ftp \${URI} -P \${DISTDIR}" MAKEOPTS="-j2" PLATFORM=$CHOST USE="dvd jpeg nls gif png truetype ppc fortran" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc-2004.3/make.defaults b/profiles/default-ppc-2004.3/make.defaults index a1a933a7d21a..cca805b12a53 100644 --- a/profiles/default-ppc-2004.3/make.defaults +++ b/profiles/default-ppc-2004.3/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.7 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc-2004.3/make.defaults,v 1.8 2005/04/23 03:40:14 jstubbs Exp $ # Gentoo Linux PowerPC system defaults ACCEPT_KEYWORDS="ppc" @@ -13,3 +13,8 @@ MAKEOPTS="-j2" PLATFORM=$CHOST USE="unicode pam dvd jpeg nls gif pam png truetype ppc fortran" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc/make.defaults b/profiles/default-ppc/make.defaults index ae50c9db115a..12890e3af1ab 100644 --- a/profiles/default-ppc/make.defaults +++ b/profiles/default-ppc/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.10 2005/03/09 00:35:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc/make.defaults,v 1.11 2005/04/23 03:40:13 jstubbs Exp $ # System-wide defaults for the Portage system ARCH="ppc" @@ -25,3 +25,9 @@ CXXFLAGS=${CFLAGS} USE="bitmap-fonts oss xv slang readline fortran font-server gpm berkdb gdbm tcpd pam libwww ssl nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X truetype-fonts type1-fonts qt kde motif opengl mozilla" ACCEPT_KEYWORDS="ppc" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc64-2004.2/make.defaults b/profiles/default-ppc64-2004.2/make.defaults index 11a826eb6f96..e2301389e256 100644 --- a/profiles/default-ppc64-2004.2/make.defaults +++ b/profiles/default-ppc64-2004.2/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.2/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" @@ -32,3 +32,9 @@ USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm # 3dfx 3dnow avi icc icc-pgo mmx svga sse ACCEPT_KEYWORDS="ppc64" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-ppc64-2004.3/make.defaults b/profiles/default-ppc64-2004.3/make.defaults index 30c5790a1d08..ac6685bc8bdc 100644 --- a/profiles/default-ppc64-2004.3/make.defaults +++ b/profiles/default-ppc64-2004.3/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.6 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-ppc64-2004.3/make.defaults,v 1.7 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" @@ -32,3 +32,9 @@ USE="bitmap-fonts oss dvd xv slang readline fortran font-server gpm berkdb gdbm # 3dfx 3dnow avi icc icc-pgo mmx svga sse ACCEPT_KEYWORDS="ppc64" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-sparc-1.4/make.defaults b/profiles/default-sparc-1.4/make.defaults index 2898280f1d07..d6fac821fec1 100644 --- a/profiles/default-sparc-1.4/make.defaults +++ b/profiles/default-sparc-1.4/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.20 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-1.4/make.defaults,v 1.21 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system ARCH="sparc" @@ -30,3 +30,8 @@ USE="arts berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gd ACCEPT_KEYWORDS="sparc" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-sparc-2004.0/make.defaults b/profiles/default-sparc-2004.0/make.defaults index a28d2f1f4c30..ec21ba04ed03 100644 --- a/profiles/default-sparc-2004.0/make.defaults +++ b/profiles/default-sparc-2004.0/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc-2004.0/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses" @@ -32,3 +32,8 @@ USE="arts berkdb bitmap-fonts crypt cups fortran fbcon font-server foomaticdb gd ACCEPT_KEYWORDS="sparc" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-sparc64-1.4/make.defaults b/profiles/default-sparc64-1.4/make.defaults index 104a866a4a6c..8032ae89ca23 100644 --- a/profiles/default-sparc64-1.4/make.defaults +++ b/profiles/default-sparc64-1.4/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.27 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-1.4/make.defaults,v 1.28 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system #Experimental: trying to use these USE variables to build up from stage 2->3 @@ -36,3 +36,8 @@ USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-serve ACCEPT_KEYWORDS="sparc" FEATURES="sandbox ccache" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-sparc64-2004.0/make.defaults b/profiles/default-sparc64-2004.0/make.defaults index 7ceb890fbd09..a6cc51fe2a4d 100644 --- a/profiles/default-sparc64-2004.0/make.defaults +++ b/profiles/default-sparc64-2004.0/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-sparc64-2004.0/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system #Experimental: trying to use these USE variables to build up from stage 2->3 @@ -36,3 +36,8 @@ USE="arts avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-serve ACCEPT_KEYWORDS="sparc" FEATURES="sandbox ccache" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-x86-2004.2/make.defaults b/profiles/default-x86-2004.2/make.defaults index ded5b3f6fa3c..0e3d363eb4ab 100644 --- a/profiles/default-x86-2004.2/make.defaults +++ b/profiles/default-x86-2004.2/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/default-x86-2004.2/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the >=gcc 3.2 Portage system #Experimental: trying to use these USE variables to build up from stage 2->3 @@ -17,3 +17,9 @@ USE="x86 oss apm arts avi berkdb bitmap-fonts crypt cups emboss encode fortran f ARCH="x86" ACCEPT_KEYWORDS="x86" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/default-x86-obsd-2004/make.defaults b/profiles/default-x86-obsd-2004/make.defaults index 4e59d18ccdd1..bb9a5515be8c 100644 --- a/profiles/default-x86-obsd-2004/make.defaults +++ b/profiles/default-x86-obsd-2004/make.defaults @@ -25,3 +25,8 @@ CC="gcc" CXX="g++" USERLAND="BSD" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/gcc33-sparc64-1.4/make.defaults b/profiles/gcc33-sparc64-1.4/make.defaults index f0396dca2631..8f61d1fcb203 100644 --- a/profiles/gcc33-sparc64-1.4/make.defaults +++ b/profiles/gcc33-sparc64-1.4/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.9 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/gcc33-sparc64-1.4/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the Portage system ARCH="sparc" @@ -31,3 +31,8 @@ USE="arts apm avi berkdb bitmap-fonts crypt cups encode esd fortran fbcon font-s ACCEPT_KEYWORDS="sparc" FEATURES="sandbox ccache" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/gcc34-amd64-2004.1/make.defaults b/profiles/gcc34-amd64-2004.1/make.defaults index 07d85ba77a1f..c808ed177385 100644 --- a/profiles/gcc34-amd64-2004.1/make.defaults +++ b/profiles/gcc34-amd64-2004.1/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.11 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-amd64-2004.1/make.defaults,v 1.12 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the gcc 3.3 Portage system #Experimental: trying to use these USE variables to build up from stage 2->3 @@ -21,3 +21,9 @@ CXXFLAGS="${CFLAGS}" # sure the user has a 32bit sandbox! it only gets installed if you add multilib # to use, recompile gcc, and then recompile portage. :/ FEATURES="-sandbox" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/gcc34-x86-2004.2/make.defaults b/profiles/gcc34-x86-2004.2/make.defaults index 6623073823cb..daaa0079abf9 100644 --- a/profiles/gcc34-x86-2004.2/make.defaults +++ b/profiles/gcc34-x86-2004.2/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.12 2005/03/09 00:35:08 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/gcc34-x86-2004.2/make.defaults,v 1.13 2005/04/23 03:40:14 jstubbs Exp $ # System-wide defaults for the >=gcc 3.2 Portage system #Experimental: trying to use these USE variables to build up from stage 2->3 @@ -19,3 +19,9 @@ ARCH="x86" ACCEPT_KEYWORDS="x86" CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/hardened-x86-2004.0/make.defaults b/profiles/hardened-x86-2004.0/make.defaults index 5da866c8a27e..60675d32b620 100644 --- a/profiles/hardened-x86-2004.0/make.defaults +++ b/profiles/hardened-x86-2004.0/make.defaults @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.9 2005/01/12 22:49:19 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/hardened-x86-2004.0/make.defaults,v 1.10 2005/04/23 03:40:14 jstubbs Exp $ GRP_STAGE23_USE="x86 berkdb crypt readline nls ssl tcpd zlib pam pic pie hardened" @@ -33,3 +33,8 @@ ACCEPT_KEYWORDS="x86" FEATURES="sandbox sfperms strict" #FEATURES="sandbox sfperms strict userpriv usersandbox" +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + diff --git a/profiles/n32-mips-2004.1/make.defaults b/profiles/n32-mips-2004.1/make.defaults index ba8cb01fee46..ec16825d58c0 100644 --- a/profiles/n32-mips-2004.1/make.defaults +++ b/profiles/n32-mips-2004.1/make.defaults @@ -30,3 +30,9 @@ ACCEPT_KEYWORDS="mips ~mips" #export LDEMULATION=elf32btsmipn32 #export GNUTARGET=elf32-ntradbigmips #EXTRA_ECONF="--libdir=/usr/lib32" + +# Env vars to expand into USE vars. Modifying this requires prior +# discussion on gentoo-dev@gentoo.org. Flat profiles also need to +# be updated appropriately. +USE_EXPAND="VIDEO_CARDS INPUT_DEVICES LINGUAS" + |