Hide CPU_FLAGS_X86 everywhere but on amd64 & x86.

diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 9d48b6df5cb4ae46a76394b59d8251a0e4b62b75..f208fffbfb71dc62f7edcf338ee50f91d1a981b8 100644 (file)
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.302 2015/01/28 21:29:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.303 2015/01/30 21:48:00 mgorny Exp $
+
+  30 Jan 2015; Michał Górny <mgorny@gentoo.org> make.defaults:
+  Hide CPU_FLAGS_X86 everywhere but on amd64 & x86.
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> package.use.force,
   package.use.mask:

diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index 4d58603fd6c1b8cbed59530ff5640485cc7ce2a9..c4143a77c506970fd420e08caad300c9f2dd66f7 100644 (file)
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.24 2015/01/28 20:56:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.25 2015/01/30 21:48:00 mgorny Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -52,8 +52,8 @@ VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx
 ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
 
 # Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
-# Unhide the ABI_X86 USE_EXPAND.
-USE_EXPAND_HIDDEN="-ABI_X86"
+# Unhide the x86-specific USE_EXPANDs.
+USE_EXPAND_HIDDEN="-ABI_X86 -CPU_FLAGS_X86"
 
 # Michał Górny <mgorny@gentoo.org> (25 Jun 2014)
 # Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied

diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
index 8809eeb282c1de7e6c5467f64e91338e67e4eac9..16c6eaa868af73e10dae42709bfeabc5ccd03a0b 100644 (file)
--- a/profiles/arch/x86/ChangeLog
+++ b/profiles/arch/x86/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo/x86 profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.188 2015/01/28 21:33:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.189 2015/01/30 21:48:00 mgorny Exp $
+
+  30 Jan 2015; Michał Górny <mgorny@gentoo.org> make.defaults:
+  Hide CPU_FLAGS_X86 everywhere but on amd64 & x86.
 
   28 Jan 2015; Michał Górny <mgorny@gentoo.org> package.use.mask:
   Update package.use.* entries for CPU_FLAGS_X86. Keep duplicate with old flags

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index 956be2bae006973a911f2b95c61c827e741ff179..da8597efc969907daa49bd125884d1f43c2b8013 100644 (file)
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.16 2014/07/01 07:50:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.17 2015/01/30 21:48:00 mgorny Exp $
 
 # All extra USE/etc should be specified in sub-profiles.
 # DO NOT POLLUTE USE ON THIS PROFILE.
@@ -14,6 +14,10 @@ CXXFLAGS="${CFLAGS}"
 FFLAGS="${CFLAGS}"
 FCFLAGS="${CFLAGS}"
 
+# Michał Górny <mgorny@gentoo.org> (30 Jan 2015)
+# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
+USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
+
 # Michał Górny <mgorny@gentoo.org> (20 Jun 2014)
 # Provide values for ABI-related variables that are compatible with
 # multilib amd64, to make consistent ebuild writing easier.

diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 3eb530994a01fdbe2baa2785368a03f11d93bbf1..db5bdade61f41b58850b7e0968fbc6a3421245b0 100644 (file)
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.762 2015/01/29 16:47:20 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.763 2015/01/30 21:48:00 mgorny Exp $
+
+  30 Jan 2015; Michał Górny <mgorny@gentoo.org> make.defaults:
+  Hide CPU_FLAGS_X86 everywhere but on amd64 & x86.
 
   29 Jan 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask:
   Mask video_cards_tegra flag.

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 0e9b3c1e5b0db5ec0f856598b499923e489effa8..051cb6d48c3eb12adde2a28be6487491f64372e2 100644 (file)
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.120 2015/01/28 18:59:43 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.121 2015/01/30 21:48:00 mgorny Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -20,7 +20,7 @@ USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
-USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86"
+USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_FLAGS_X86"
 
 CONFIG_PROTECT="/etc"
 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"