Set ABI_X86 flags for amd64 & x86 up.

6 files changed, 33 insertions, 8 deletions

diff --git a/profiles/arch/amd64/ChangeLog b/profiles/arch/amd64/ChangeLog
index 4db1b1d1c328..00ac15a2e729 100644
--- a/profiles/arch/amd64/ChangeLog
+++ b/profiles/arch/amd64/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo/AMD64 profile directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.206 2013/01/25 16:42:42 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/ChangeLog,v 1.207 2013/02/01 21:28:56 mgorny Exp $
+
+  01 Feb 2013; Michał Górny <mgorny@gentoo.org> make.defaults,
+  no-multilib/make.defaults, no-multilib/use.mask, use.force, use.mask:
+  Set ABI_X86 flags for amd64 & x86 up.
 
   25 Jan 2013; Christoph Junghans <ottxor@gentoo.org> use.mask:
   unmask missing amd64/x86 instruction sets
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index bd020bbaab0c..62e42dda2596 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.15 2012/11/12 15:36:54 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.16 2013/02/01 21:28:56 mgorny Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
@@ -45,3 +45,7 @@ VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx
 # 2006/12/22 - Danny van Dyk <kugelfang@gentoo.org>
 # Default for ALSA_CARDS USE_EXPAND variable.
 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"
diff --git a/profiles/arch/amd64/no-multilib/make.defaults b/profiles/arch/amd64/no-multilib/make.defaults
index 5f5b0f7c160e..f967fe35deed 100644
--- a/profiles/arch/amd64/no-multilib/make.defaults
+++ b/profiles/arch/amd64/no-multilib/make.defaults
@@ -1,5 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/make.defaults,v 1.1 2008/04/01 17:39:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/make.defaults,v 1.2 2013/02/01 21:28:56 mgorny Exp $
 
 MULTILIB_ABIS="amd64"
+
+# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
+# Hide the ABI_X86 USE_EXPAND back for non-multilib profile.
+USE_EXPAND_HIDDEN="ABI_X86"
diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
index 8446804306d9..83eab77f26f6 100644
--- a/profiles/arch/amd64/no-multilib/use.mask
+++ b/profiles/arch/amd64/no-multilib/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/use.mask,v 1.12 2012/02/10 21:34:45 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/use.mask,v 1.13 2013/02/01 21:28:56 mgorny Exp $
 
 # USE flags masked because providing packages have ABI=x86
 
@@ -19,3 +19,7 @@ hvm
 # Matt Turner <mattst88@gentoo.org) (10 Feb 2012)
 # mask d3d since wine is 32-bit
 d3d
+
+# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
+# Mask the multilib flags back for non-multilib profile.
+abi_x86_32
diff --git a/profiles/arch/amd64/use.force b/profiles/arch/amd64/use.force
index b54bac8604ad..53a33330f09a 100644
--- a/profiles/arch/amd64/use.force
+++ b/profiles/arch/amd64/use.force
@@ -1,2 +1,6 @@
 # Force the flag which corresponds to ARCH.
 amd64
+
+# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
+# Force the flag corresponding to the default ABI.
+abi_x86_64
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index d4df20a423f8..6b16b46b9b3e 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.44 2013/01/26 00:16:31 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.45 2013/02/01 21:28:56 mgorny Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64
@@ -181,4 +181,9 @@ capslib
 # fdk-aac is already keyworded here
 -fdk
 
+# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
+# Unmask the multilib flags for this arch.
+-abi_x86_32
+-abi_x86_64
+
 # NOT NECESSARY - SECTION