dont put $ARCH into USE, let portage do it

17 files changed, 32 insertions, 34 deletions

diff --git a/profiles/default-linux/alpha/2004.3/make.defaults b/profiles/default-linux/alpha/2004.3/make.defaults
index 645c256b20db..ac0e78ec5074 100644
--- a/profiles/default-linux/alpha/2004.3/make.defaults
+++ b/profiles/default-linux/alpha/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-linux/alpha/2004.3/make.defaults,v 1.7 2005/03/09 00:35:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/2004.3/make.defaults,v 1.8 2005/05/06 21:46:26 vapier Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -13,7 +13,6 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurs
 # pulled in during *emerge system*!
 
 USE="
-alpha
 arts
 avi
 berkdb
diff --git a/profiles/default-linux/alpha/make.defaults b/profiles/default-linux/alpha/make.defaults
index 3231ef5fe2fd..55223ea0c9aa 100644
--- a/profiles/default-linux/alpha/make.defaults
+++ b/profiles/default-linux/alpha/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-linux/alpha/make.defaults,v 1.3 2005/04/16 08:17:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/alpha/make.defaults,v 1.4 2005/05/06 21:46:26 vapier Exp $
 
 ARCH="alpha"
 ACCEPT_KEYWORDS="alpha"
@@ -17,7 +17,6 @@ GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 # pulled in during *emerge system*!
 
 USE="
-alpha
 arts
 avi
 berkdb
diff --git a/profiles/default-linux/ppc/1.0/make.defaults b/profiles/default-linux/ppc/1.0/make.defaults
index ed955bdb72b3..e6c387b65c36 100644
--- a/profiles/default-linux/ppc/1.0/make.defaults
+++ b/profiles/default-linux/ppc/1.0/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/make.defaults,v 1.10 2005/03/09 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/make.defaults,v 1.11 2005/05/06 21:48:31 vapier Exp $
 
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype ppc"
+USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype"
diff --git a/profiles/default-linux/ppc/1.2/make.defaults b/profiles/default-linux/ppc/1.2/make.defaults
index 065bb9e97727..84b8ad0f7d3d 100644
--- a/profiles/default-linux/ppc/1.2/make.defaults
+++ b/profiles/default-linux/ppc/1.2/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/make.defaults,v 1.10 2005/03/09 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/make.defaults,v 1.11 2005/05/06 21:48:31 vapier Exp $
 
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype ppc"
+USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype"
diff --git a/profiles/default-linux/ppc/1.4/make.defaults b/profiles/default-linux/ppc/1.4/make.defaults
index bc86d1f3b1b3..6264d202c11c 100644
--- a/profiles/default-linux/ppc/1.4/make.defaults
+++ b/profiles/default-linux/ppc/1.4/make.defaults
@@ -1,7 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/make.defaults,v 1.10 2005/03/09 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/make.defaults,v 1.11 2005/05/06 21:48:31 vapier Exp $
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
 
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde motif opengl mozilla png truetype ppc cups foomaticdb"
+USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde motif opengl mozilla png truetype cups foomaticdb"
diff --git a/profiles/default-linux/ppc/2004.0/make.defaults b/profiles/default-linux/ppc/2004.0/make.defaults
index 337b8cd58cde..a103b3317d8f 100644
--- a/profiles/default-linux/ppc/2004.0/make.defaults
+++ b/profiles/default-linux/ppc/2004.0/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.15 2005/03/09 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.16 2005/05/06 21:48:31 vapier Exp $
 
-USE="bitmap-fonts dvd font-server gif jpeg nls  png ppc truetype truetype-fonts type1-fonts fortran"
+USE="bitmap-fonts dvd font-server gif jpeg nls  png truetype truetype-fonts type1-fonts fortran"
diff --git a/profiles/default-linux/ppc/2004.1/make.defaults b/profiles/default-linux/ppc/2004.1/make.defaults
index fa5b5ed5d9e2..aea122cfc641 100644
--- a/profiles/default-linux/ppc/2004.1/make.defaults
+++ b/profiles/default-linux/ppc/2004.1/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.15 2005/03/09 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.16 2005/05/06 21:48:31 vapier Exp $
 
-USE="bitmap-fonts dvd font-server gif jpeg nls  png ppc truetype truetype-fonts type1-fonts fortran"
+USE="bitmap-fonts dvd font-server gif jpeg nls png truetype truetype-fonts type1-fonts fortran"
diff --git a/profiles/default-linux/ppc/2004.2/make.defaults b/profiles/default-linux/ppc/2004.2/make.defaults
index 5e92d5dc0b90..b6973f71538b 100644
--- a/profiles/default-linux/ppc/2004.2/make.defaults
+++ b/profiles/default-linux/ppc/2004.2/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.15 2005/03/09 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.16 2005/05/06 21:48:31 vapier Exp $
 
-USE="bitmap-fonts dvd font-server gif jpeg nls png ppc truetype truetype-fonts type1-fonts fortran"
+USE="bitmap-fonts dvd font-server gif jpeg nls png truetype truetype-fonts type1-fonts fortran"
diff --git a/profiles/default-linux/ppc/2004.3/make.defaults b/profiles/default-linux/ppc/2004.3/make.defaults
index c8e6e2744515..33b04bd38fe8 100644
--- a/profiles/default-linux/ppc/2004.3/make.defaults
+++ b/profiles/default-linux/ppc/2004.3/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/make.defaults,v 1.12 2005/03/09 00:35:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/make.defaults,v 1.13 2005/05/06 21:48:31 vapier Exp $
 
-USE="pam bitmap-fonts dvd font-server gif jpeg nls png ppc truetype xv truetype-fonts type1-fonts fortran emboss"
+USE="pam bitmap-fonts dvd font-server gif jpeg nls png truetype xv truetype-fonts type1-fonts fortran emboss"
diff --git a/profiles/default-linux/ppc/make.defaults b/profiles/default-linux/ppc/make.defaults
index 8180f424ecf1..bcac70ec7647 100644
--- a/profiles/default-linux/ppc/make.defaults
+++ b/profiles/default-linux/ppc/make.defaults
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/make.defaults,v 1.3 2005/04/15 19:05:46 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/make.defaults,v 1.4 2005/05/06 21:48:31 vapier Exp $
 
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-USE="unicode pam bitmap-fonts dvd gif jpeg mp3 nls png ppc xv truetype truetype-fonts type1-fonts fortran xprint opengl emboss"
+USE="unicode pam bitmap-fonts dvd gif jpeg mp3 nls png xv truetype truetype-fonts type1-fonts fortran xprint opengl emboss"
 
 CHOST="powerpc-unknown-linux-gnu"
 
diff --git a/profiles/default-linux/ppc64/2004.3/make.defaults b/profiles/default-linux/ppc64/2004.3/make.defaults
index aa60748b47c9..a732326f9f9a 100644
--- a/profiles/default-linux/ppc64/2004.3/make.defaults
+++ b/profiles/default-linux/ppc64/2004.3/make.defaults
@@ -1,5 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2004.3/make.defaults,v 1.3 2005/03/05 17:14:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2004.3/make.defaults,v 1.4 2005/05/06 21:47:40 vapier Exp $
 
-USE="unicode pam bitmap-fonts font-server gif jpeg nls png ppc64 truetype truetype-fonts type1-fonts zlib"
+USE="unicode pam bitmap-fonts font-server gif jpeg nls png truetype truetype-fonts type1-fonts zlib"
diff --git a/profiles/default-linux/ppc64/2005.0/make.defaults b/profiles/default-linux/ppc64/2005.0/make.defaults
index fef470ded247..494d896608ed 100644
--- a/profiles/default-linux/ppc64/2005.0/make.defaults
+++ b/profiles/default-linux/ppc64/2005.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-linux/ppc64/2005.0/make.defaults,v 1.4 2005/03/12 02:22:56 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/2005.0/make.defaults,v 1.5 2005/05/06 21:47:40 vapier Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
@@ -15,6 +15,6 @@ ACCEPT_KEYWORDS="ppc64"
 STAGE1_USE="unicode"
 GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib"
+USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib"
 
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults
index b436613a4a93..6ca6b50e6b08 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/970/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-linux/ppc64/dev/2005.1/970/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/970/make.defaults,v 1.2 2005/05/06 21:47:40 vapier Exp $
 
 ARCH="ppc64"
 
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
 STAGE1_USE="unicode"
 GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
 
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults
index 39fb056b6c1a..f28293b3dbbe 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/power3/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-linux/ppc64/dev/2005.1/power3/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/power3/make.defaults,v 1.2 2005/05/06 21:47:40 vapier Exp $
 
 ARCH="ppc64"
 
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
 STAGE1_USE="unicode"
 GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
 
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults
index 4957315388c9..f73474a12499 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/power4/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-linux/ppc64/dev/2005.1/power4/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/power4/make.defaults,v 1.2 2005/05/06 21:47:40 vapier Exp $
 
 ARCH="ppc64"
 
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
 STAGE1_USE="unicode"
 GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
 
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults b/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults
index 3cf681033ad5..726af3e1c7f2 100644
--- a/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults
+++ b/profiles/default-linux/ppc64/dev/2005.1/power5/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-linux/ppc64/dev/2005.1/power5/make.defaults,v 1.1 2005/04/08 04:41:47 dostrow Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/dev/2005.1/power5/make.defaults,v 1.2 2005/05/06 21:47:40 vapier Exp $
 
 ARCH="ppc64"
 
@@ -14,6 +14,6 @@ ACCEPT_KEYWORDS="ppc64"
 STAGE1_USE="unicode"
 GRP_STAGE23_USE="unicode ipv6 pam tcpd readline nls ssl gpm perl python berkdb ncurses"
 
-USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png ppc64 python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
+USE="unicode pam berkdb bitmap-fonts gif jpeg nls ncurses perl png python readline ssl tcpd truetype truetype-fonts type1-fonts zlib ibm nptl"
 
 FEATURES="autoconfig sandbox sfperms"
diff --git a/profiles/default-linux/ppc64/make.defaults b/profiles/default-linux/ppc64/make.defaults
index e4ebc8506308..5888c525464c 100644
--- a/profiles/default-linux/ppc64/make.defaults
+++ b/profiles/default-linux/ppc64/make.defaults
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/make.defaults,v 1.1 2005/03/05 17:14:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc64/make.defaults,v 1.2 2005/05/06 21:47:40 vapier Exp $
 
 ARCH="ppc64"
 ACCEPT_KEYWORDS="ppc64"
 
-USE="unicode pam bitmap-fonts gif jpeg nls png ppc64 truetype truetype-fonts type1-fonts zlib"
+USE="unicode pam bitmap-fonts gif jpeg nls png truetype truetype-fonts type1-fonts zlib"
 FEATURES="autoconfig sandbox sfperms"