Moved 2005.0/make.defaults to make.defaults and removed redundant GRP_STAGE23_USE, ARCH, and ACCEPT_KEYWORDS from other profiles, as necessary.

9 files changed, 14 insertions, 62 deletions

diff --git a/profiles/default-linux/ppc/1.0/make.defaults b/profiles/default-linux/ppc/1.0/make.defaults
index 917f8701508f..121a1f281a03 100644
--- a/profiles/default-linux/ppc/1.0/make.defaults
+++ b/profiles/default-linux/ppc/1.0/make.defaults
@@ -1,12 +1,5 @@
 # Copyright 1999-2004 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.8 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0/make.defaults,v 1.9 2005/03/05 17:11:54 wolf31o2 Exp $
 
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran f77
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde
-motif opengl mozilla png truetype ppc"
-
-FEATURES="sandbox sfperms"
+USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran f77 nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype ppc"
diff --git a/profiles/default-linux/ppc/1.0_rc/make.defaults b/profiles/default-linux/ppc/1.0_rc/make.defaults
index d880ee1051ba..6b71f637b0e6 100644
--- a/profiles/default-linux/ppc/1.0_rc/make.defaults
+++ b/profiles/default-linux/ppc/1.0_rc/make.defaults
@@ -1,12 +1,5 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/make.defaults,v 1.8 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.0_rc/make.defaults,v 1.9 2005/03/05 17:11:54 wolf31o2 Exp $
 
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-
-USE="oss xv slang readline gpm berkdb gdbm tcpd pam libwww ssl fortran f77
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde
-motif opengl mozilla"
-
-FEATURES="sandbox sfperms"
+USE="oss xv slang readline gpm berkdb gdbm tcpd pam libwww ssl fortran f77 nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla"
diff --git a/profiles/default-linux/ppc/1.2/make.defaults b/profiles/default-linux/ppc/1.2/make.defaults
index c2ebbb8db6ac..604442888d2c 100644
--- a/profiles/default-linux/ppc/1.2/make.defaults
+++ b/profiles/default-linux/ppc/1.2/make.defaults
@@ -1,12 +1,5 @@
 # Copyright 1999-2004 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.8 2004/11/08 00:22:08 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.2/make.defaults,v 1.9 2005/03/05 17:11:54 wolf31o2 Exp $
 
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-
-USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran f77
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde
-motif opengl mozilla png truetype ppc"
-
-FEATURES="sandbox sfperms"
+USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran f77 nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk X qt kde motif opengl mozilla png truetype ppc"
diff --git a/profiles/default-linux/ppc/1.4/make.defaults b/profiles/default-linux/ppc/1.4/make.defaults
index a53ee1946cdd..2aa88fe6704e 100644
--- a/profiles/default-linux/ppc/1.4/make.defaults
+++ b/profiles/default-linux/ppc/1.4/make.defaults
@@ -1,14 +1,7 @@
 # Copyright 1999-2004 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.8 2004/11/08 00:22:08 lv Exp $
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/1.4/make.defaults,v 1.9 2005/03/05 17:11:54 wolf31o2 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 f77
-nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde
-motif opengl mozilla png truetype ppc cups foomaticdb"
-
-FEATURES="sandbox sfperms"
+USE="oss dvd xv slang readline gpm berkdb gdbm tcpd pam libwww ssl jpeg fortran f77 nls mitshm perl python esd gif imlib sdl oggvorbis gnome gtk gtk2 X qt kde motif opengl mozilla png truetype ppc cups foomaticdb"
diff --git a/profiles/default-linux/ppc/2004.0/make.defaults b/profiles/default-linux/ppc/2004.0/make.defaults
index e9fb5e03bf8b..2da23efccc30 100644
--- a/profiles/default-linux/ppc/2004.0/make.defaults
+++ b/profiles/default-linux/ppc/2004.0/make.defaults
@@ -1,10 +1,5 @@
 # Copyright 1999-2004 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.13 2005/01/12 23:08:21 spyderous Exp $
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.0/make.defaults,v 1.14 2005/03/05 17:11:54 wolf31o2 Exp $
 
 USE="bitmap-fonts dvd font-server gif jpeg nls  png ppc truetype truetype-fonts type1-fonts fortran f77"
-
-FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.1/make.defaults b/profiles/default-linux/ppc/2004.1/make.defaults
index bd1401bdfe72..c361ab750108 100644
--- a/profiles/default-linux/ppc/2004.1/make.defaults
+++ b/profiles/default-linux/ppc/2004.1/make.defaults
@@ -1,10 +1,5 @@
 # Copyright 1999-2004 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.13 2005/01/12 23:08:21 spyderous Exp $
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.1/make.defaults,v 1.14 2005/03/05 17:11:54 wolf31o2 Exp $
 
 USE="bitmap-fonts dvd font-server gif jpeg nls  png ppc truetype truetype-fonts type1-fonts fortran f77"
-
-FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.2/make.defaults b/profiles/default-linux/ppc/2004.2/make.defaults
index c6c10989c11e..8280d3846673 100644
--- a/profiles/default-linux/ppc/2004.2/make.defaults
+++ b/profiles/default-linux/ppc/2004.2/make.defaults
@@ -1,10 +1,5 @@
 # Copyright 1999-2004 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.13 2005/01/12 23:08:21 spyderous Exp $
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.2/make.defaults,v 1.14 2005/03/05 17:11:54 wolf31o2 Exp $
 
 USE="bitmap-fonts dvd font-server gif jpeg nls png ppc truetype truetype-fonts type1-fonts fortran f77"
-
-FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2004.3/make.defaults b/profiles/default-linux/ppc/2004.3/make.defaults
index eb3a474ec5cf..420bcbfafb8a 100644
--- a/profiles/default-linux/ppc/2004.3/make.defaults
+++ b/profiles/default-linux/ppc/2004.3/make.defaults
@@ -1,10 +1,5 @@
 # Copyright 1999-2004 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.10 2005/02/18 10:52:21 lu_zero Exp $
-
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2004.3/make.defaults,v 1.11 2005/03/05 17:11:54 wolf31o2 Exp $
 
 USE="pam bitmap-fonts dvd font-server gif jpeg nls png ppc truetype xv truetype-fonts type1-fonts fortran f77 emboss"
-
-FEATURES="sandbox sfperms"
diff --git a/profiles/default-linux/ppc/2005.0/make.defaults b/profiles/default-linux/ppc/make.defaults
index b6bd80f8857d..a0db4ba603f7 100644
--- a/profiles/default-linux/ppc/2005.0/make.defaults
+++ b/profiles/default-linux/ppc/make.defaults
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/2005.0/make.defaults,v 1.8 2005/02/18 10:52:21 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/ppc/make.defaults,v 1.1 2005/03/05 17:11:54 wolf31o2 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 nls png ppc xv truetype truetype-fonts type1-fonts fortran f77 xprint opengl emboss"
+USE="unicode pam bitmap-fonts dvd gif jpeg mp3 nls png ppc xv truetype truetype-fonts type1-fonts fortran f77 xprint opengl emboss"
 
 FEATURES="sandbox sfperms"