Mask and force USE flags that correspond to ARCH values. All arch profiles

now inherit from arch/base, which masks the USE flags that correspond to
all possible ARCH values. Each of the individual arch profiles unmasks and
forces the USE flag which corresponds to its ARCH value.

42 files changed, 130 insertions, 7 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 42a511ed5589..8bd26c696896 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,31 @@
 # ChangeLog for profile directory
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1883 2008/09/20 16:51:15 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.1884 2008/09/21 00:11:51 zmedico 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!
 
+  20 Sep 2008; Zac Medico <zmedico@gentoo.org> +arch/alpha/parent,
+  +arch/alpha/use.force, arch/alpha/use.mask, arch/amd64/parent,
+  +arch/amd64/use.force, arch/amd64/use.mask, +arch/arm/parent,
+  +arch/arm/use.force, arch/arm/use.mask, +arch/base/use.mask,
+  +arch/hppa/parent, +arch/hppa/use.force, arch/hppa/use.mask,
+  +arch/ia64/parent, +arch/ia64/use.force, arch/ia64/use.mask,
+  +arch/m68k/parent, +arch/m68k/use.force, arch/m68k/use.mask,
+  +arch/mips/parent, +arch/mips/use.force, arch/mips/use.mask,
+  +arch/powerpc/parent, +arch/powerpc/ppc32/use.force,
+  +arch/powerpc/ppc32/use.mask, +arch/powerpc/ppc64/32ul/use.force,
+  arch/powerpc/ppc64/32ul/use.mask, +arch/powerpc/ppc64/use.force,
+  arch/powerpc/ppc64/use.mask, +arch/s390/parent, +arch/s390/use.force,
+  arch/s390/use.mask, +arch/sh/parent, +arch/sh/use.force, arch/sh/use.mask,
+  arch/sparc/parent, +arch/sparc/use.force, arch/sparc/use.mask,
+  +arch/x86/parent, +arch/x86/use.force, arch/x86/use.mask:
+  Mask and force USE flags that correspond to ARCH values. All arch profiles
+  now inherit from arch/base, which masks the USE flags that correspond to
+  all possible ARCH values. Each of the individual arch profiles unmasks and
+  forces the USE flag which corresponds to its ARCH value.
+
   20 Sep 2008; Andreas Proschofsky <suka@gentoo.org> package.mask:
   mask app-office/ooqstart-gnome and app-office/oooqs for upcoming removal
 
diff --git a/profiles/arch/alpha/parent b/profiles/arch/alpha/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/alpha/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/alpha/use.force b/profiles/arch/alpha/use.force
new file mode 100644
index 000000000000..c99355e95b9e
--- /dev/null
+++ b/profiles/arch/alpha/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+alpha
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index 931963423646..bcdfa0fd3989 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -1,6 +1,9 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.9 2008/08/31 15:14:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/alpha/use.mask,v 1.10 2008/09/21 00:11:52 zmedico Exp $
+
+# Unmask the flag which corresponds to ARCH.
+-alpha
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent
index 063a2572cf79..c5b66f7e9c9c 100644
--- a/profiles/arch/amd64/parent
+++ b/profiles/arch/amd64/parent
@@ -1 +1,2 @@
+../base
 ../../features/multilib
diff --git a/profiles/arch/amd64/use.force b/profiles/arch/amd64/use.force
new file mode 100644
index 000000000000..b54bac8604ad
--- /dev/null
+++ b/profiles/arch/amd64/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+amd64
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 44ee9f107322..923e7a42264e 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,6 +1,9 @@
 # Copyright 2004 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.3 2008/08/24 11:28:52 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.4 2008/09/21 00:11:52 zmedico Exp $
+
+# Unmask the flag which corresponds to ARCH.
+-amd64
 
 # SECTION: Unmask
 
diff --git a/profiles/arch/arm/parent b/profiles/arch/arm/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/arm/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/arm/use.force b/profiles/arch/arm/use.force
new file mode 100644
index 000000000000..7116ac8c8915
--- /dev/null
+++ b/profiles/arch/arm/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+arm
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index a4cfd21ced50..c48766ed8fb5 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -2,6 +2,9 @@
 # net-misc/networkmanager not keyworded
 networkmanager
 
+# Unmask the flag which corresponds to ARCH.
+-arm
+
 # Samuli Suominen <drac@gentoo.org>
 # media-libs/amrnb and media-libs/amrwb not tested.
 amr
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
new file mode 100644
index 000000000000..7c6e2e769425
--- /dev/null
+++ b/profiles/arch/base/use.mask
@@ -0,0 +1,16 @@
+# Mask flags that correspond to all possible ARCH values.
+alpha
+amd64
+arm
+hppa
+ia64
+m68k
+mips
+ppc
+ppc64
+s390
+sh
+sparc
+sparc-fbsd
+x86
+x86-fbsd
diff --git a/profiles/arch/hppa/parent b/profiles/arch/hppa/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/hppa/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/hppa/use.force b/profiles/arch/hppa/use.force
new file mode 100644
index 000000000000..9b60317bfc20
--- /dev/null
+++ b/profiles/arch/hppa/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+hppa
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index e0e843433ce3..c50e22f4d302 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -1,7 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# # $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.3 2008/04/10 06:34:00 dberkholz Exp $
+# # $Header: /var/cvsroot/gentoo-x86/profiles/arch/hppa/use.mask,v 1.4 2008/09/21 00:11:54 zmedico Exp $
 # DON'T TOUCH THIS FILE. Instead, file a bug and assign it to <hppa@gentoo.org>.
 
+# Unmask the flag which corresponds to ARCH.
+-hppa
+
 # Jeroen Roovers <jer@gentoo.org> (4 Jan 2008)
 # Masked until someone turns up with a PA-RISC laptop:
 laptop
diff --git a/profiles/arch/ia64/parent b/profiles/arch/ia64/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/ia64/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/ia64/use.force b/profiles/arch/ia64/use.force
new file mode 100644
index 000000000000..1dfcca5c0949
--- /dev/null
+++ b/profiles/arch/ia64/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+ia64
diff --git a/profiles/arch/ia64/use.mask b/profiles/arch/ia64/use.mask
index 399700755b5b..bdf960710ab7 100644
--- a/profiles/arch/ia64/use.mask
+++ b/profiles/arch/ia64/use.mask
@@ -1,3 +1,6 @@
+# Unmask the flag which corresponds to ARCH.
+-ia64
+
 # This is a list of USE flags that should not be used on ia64.
 
 # No hardware to test by the team
diff --git a/profiles/arch/m68k/parent b/profiles/arch/m68k/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/m68k/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/m68k/use.force b/profiles/arch/m68k/use.force
new file mode 100644
index 000000000000..f69a0469b48e
--- /dev/null
+++ b/profiles/arch/m68k/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+m68k
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index 8f01c7223881..dfcba8d5ec2e 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -1,3 +1,6 @@
+# Unmask the flag which corresponds to ARCH.
+-m68k
+
 hardened
 
 # Paul de Vrieze <pauldv@gentoo.org>
diff --git a/profiles/arch/mips/parent b/profiles/arch/mips/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/mips/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/mips/use.force b/profiles/arch/mips/use.force
new file mode 100644
index 000000000000..d2550377e45c
--- /dev/null
+++ b/profiles/arch/mips/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+mips
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index dde59c339f9b..47f5c229cd80 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -1,4 +1,7 @@
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.7 2008/05/03 22:20:47 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/mips/use.mask,v 1.8 2008/09/21 00:11:56 zmedico Exp $
+
+# Unmask the flag which corresponds to ARCH.
+-mips
 
 # Ryan Hill <dirtyepic@gentoo.org>
 # Various Gnome flags
diff --git a/profiles/arch/powerpc/parent b/profiles/arch/powerpc/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/powerpc/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/powerpc/ppc32/use.force b/profiles/arch/powerpc/ppc32/use.force
new file mode 100644
index 000000000000..ebd35a2034ce
--- /dev/null
+++ b/profiles/arch/powerpc/ppc32/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+ppc
diff --git a/profiles/arch/powerpc/ppc32/use.mask b/profiles/arch/powerpc/ppc32/use.mask
new file mode 100644
index 000000000000..83bba4369aa6
--- /dev/null
+++ b/profiles/arch/powerpc/ppc32/use.mask
@@ -0,0 +1,2 @@
+# Unmask the flag which corresponds to ARCH.
+-ppc
diff --git a/profiles/arch/powerpc/ppc64/32ul/use.force b/profiles/arch/powerpc/ppc64/32ul/use.force
new file mode 100644
index 000000000000..c74bf3460241
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/32ul/use.force
@@ -0,0 +1,5 @@
+# Force the flag which corresponds to ARCH.
+ppc
+
+# Unforce the flag which corresponds to the 64-bit ARCH.
+-ppc64
diff --git a/profiles/arch/powerpc/ppc64/32ul/use.mask b/profiles/arch/powerpc/ppc64/32ul/use.mask
index 9b09de2deaf0..2e4685d1f36d 100644
--- a/profiles/arch/powerpc/ppc64/32ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/32ul/use.mask
@@ -1,2 +1,8 @@
+# Unmask the flag which corresponds to ARCH.
+-ppc
+
+# Mask the flag which corresponds to the 64-bit ARCH.
+ppc64
+
 # We mask this since we're not really a multilib profile
 multilib
diff --git a/profiles/arch/powerpc/ppc64/use.force b/profiles/arch/powerpc/ppc64/use.force
new file mode 100644
index 000000000000..88544d5e9243
--- /dev/null
+++ b/profiles/arch/powerpc/ppc64/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+ppc64
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index 38a20adcb78d..5d0ed21b3131 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -1,5 +1,8 @@
 ### THIS FILE IS ONLY FOR PACKAGES MASKED ON BOTH 64-BIT AND 32-BIT USERLAND!!!
 
+# Unmask the flag which corresponds to ARCH.
+-ppc64
+
 # Raúl Porcel <armin76@gentoo.org> (11 Aug 2008)
 # Missing keyword on net-wireless/madwifi
 madwifi
diff --git a/profiles/arch/s390/parent b/profiles/arch/s390/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/s390/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/s390/use.force b/profiles/arch/s390/use.force
new file mode 100644
index 000000000000..fcac5ab9e7a7
--- /dev/null
+++ b/profiles/arch/s390/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+s390
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index 4ac48cf73b9e..32e61cdaed89 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -1,3 +1,6 @@
+# Unmask the flag which corresponds to ARCH.
+-s390
+
 # This file contains a list of useflags that cannot be used on s390.
 dell
 pcmcia
diff --git a/profiles/arch/sh/parent b/profiles/arch/sh/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/sh/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/sh/use.force b/profiles/arch/sh/use.force
new file mode 100644
index 000000000000..f59d57ad619b
--- /dev/null
+++ b/profiles/arch/sh/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+sh
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index 2febae238f67..2d6b45beb949 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -1,3 +1,6 @@
+# Unmask the flag which corresponds to ARCH.
+-sh
+
 # Mart Raudsepp <leio@gentoo.org>
 # net-misc/networkmanager not keyworded
 networkmanager
diff --git a/profiles/arch/sparc/parent b/profiles/arch/sparc/parent
index 54a6e722185e..8f767889ec91 100644
--- a/profiles/arch/sparc/parent
+++ b/profiles/arch/sparc/parent
@@ -1 +1,2 @@
+../base
 ../../features/32bit-userland
diff --git a/profiles/arch/sparc/use.force b/profiles/arch/sparc/use.force
new file mode 100644
index 000000000000..f95aef4e1765
--- /dev/null
+++ b/profiles/arch/sparc/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+sparc
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index 60ea50035ecb..7e0d09a53d0d 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -1,6 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.14 2008/09/14 01:33:59 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/sparc/use.mask,v 1.15 2008/09/21 00:12:01 zmedico Exp $
+
+# Unmask the flag which corresponds to ARCH.
+-sparc
 
 # This file contains a list of useflags that cannot be used on sparc.
 
diff --git a/profiles/arch/x86/parent b/profiles/arch/x86/parent
new file mode 100644
index 000000000000..eb001c6e8ab8
--- /dev/null
+++ b/profiles/arch/x86/parent
@@ -0,0 +1 @@
+../base
diff --git a/profiles/arch/x86/use.force b/profiles/arch/x86/use.force
new file mode 100644
index 000000000000..049e7af15419
--- /dev/null
+++ b/profiles/arch/x86/use.force
@@ -0,0 +1,2 @@
+# Force the flag which corresponds to ARCH.
+x86
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index a500aa079d48..4c7dae258dee 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -1,6 +1,9 @@
 # Copyright 2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.5 2008/05/10 19:41:29 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.6 2008/09/21 00:12:01 zmedico Exp $
+
+# Unmask the flag which corresponds to ARCH.
+-x86
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # x86 profile.  This works, for example, if another architecture's