summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-09-13 05:19:55 +0000
committerZac Medico <zmedico@gentoo.org>2012-09-13 05:19:55 +0000
commit0a287108fe864edea199337740098f6abc017bf1 (patch)
treecd8191c794d9f0b8eb45eec416c84b63697e470f /profiles
parentVersion bump. (diff)
downloadgentoo-2-0a287108fe864edea199337740098f6abc017bf1.tar.gz
gentoo-2-0a287108fe864edea199337740098f6abc017bf1.tar.bz2
gentoo-2-0a287108fe864edea199337740098f6abc017bf1.zip
alpha amd64 amd64-fbsd amd64-linux arm arm-linux hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd # Prefix keywords s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt
Diffstat (limited to 'profiles')
-rw-r--r--profiles/base/ChangeLog7
-rw-r--r--profiles/base/make.defaults11
2 files changed, 16 insertions, 2 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index d922819938fc..b07e4f37e3f1 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,11 @@
# 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.431 2012/09/12 01:08:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.432 2012/09/13 05:19:55 zmedico Exp $
+
+ 13 Sep 2012; Zac Medico <zmedico@gentoo.org> make.defaults:
+ Populate variables for "Profile IUSE injection" (applies only to ebuilds
+ which use EAPI 5 or later). These are just minimal settings for ARCH, ELIBC,
+ KERNEL, and USERLAND flags which everyone can probably agree on.
12 Sep 2012; Davide Pesavento <pesa@gentoo.org> package.use.force:
Force usage of bundled botan in >=qt-creator-2.6
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 1527b85eac78..2d04e46308d4 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,10 +1,19 @@
# 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.83 2012/06/22 10:33:10 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.84 2012/09/13 05:19:55 zmedico Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
+# Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later)
+IUSE_IMPLICIT=""
+USE_EXPAND_UNPREFIXED="ARCH"
+USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
+USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt"
+USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin FreeBSD glibc HPUX Interix mintlib NetBSD OpenBSD SunOS uclibc Winnt"
+USE_EXPAND_VALUES_KERNEL="AIX Cygwin Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt"
+USE_EXPAND_VALUES_USERLAND="BSD GNU"
+
# 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 VOICEMAIL_STORAGE"