Move GRP_STAGE23_USE and USE from 2005.0/make.defaults to make.defaults, removing 2004.3 and 2005.0 make.defaults, and cleaning up 2004.2 make.defaults.

4 files changed, 5 insertions, 127 deletions

diff --git a/profiles/default-linux/hppa/2004.2/make.defaults b/profiles/default-linux/hppa/2004.2/make.defaults
index 2a25060d1c6a..5ab3b64083b3 100644
--- a/profiles/default-linux/hppa/2004.2/make.defaults
+++ b/profiles/default-linux/hppa/2004.2/make.defaults
@@ -1,62 +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/hppa/2004.2/make.defaults,v 1.9 2005/01/12 23:08:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2004.2/make.defaults,v 1.10 2005/03/05 17:00:00 wolf31o2 Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
 
 # System-wide defaults for the Portage system
 
-USE="
-berkdb
-bitmap-fonts
-crypt
-cups
-encode
-font-server
-foomaticdb
-fortran
-f77
-gdbm
-gif
-gnome
-gpm
-gtk
-gtk2
-imlib
-jpeg
-kde
-libg++
-libwww
-mikmod
-motif
-ncurses
-nls
-oggvorbis
-opengl
-oss
-pam
-pdflib
-pic
-png
-python
-qt
-quicktime
-readline
-sdl
-spell
-ssl
-svga
-tcpd
-truetype
-truetype-fonts
-type1-fonts
-X
-xml2
-xmms
-xv
-zlib
-"
+USE="berkdb bitmap-fonts crypt cups encode font-server foomaticdb fortran f77 gdbm gif gnome gpm gtk gtk2 imlib jpeg kde libg++ libwww mikmod motif ncurses nls oggvorbis opengl oss pam pdflib pic png python qt quicktime readline sdl spell ssl svga tcpd truetype truetype-fonts type1-fonts X xml2 xmms xv zlib"
 
 GRP_STAGE23_USE="ipv6 pam tcpd readline nls ssl gpm perl python berkdb acl ncurses"
-
diff --git a/profiles/default-linux/hppa/2004.3/make.defaults b/profiles/default-linux/hppa/2004.3/make.defaults
deleted file mode 100644
index 339e39c735a1..000000000000
--- a/profiles/default-linux/hppa/2004.3/make.defaults
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2004.3/make.defaults,v 1.3 2005/01/06 10:49:42 gmsoft Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-# System-wide defaults for the Portage system
-
-USE="
-berkdb
-crypt
-cups
-foomaticdb
-fortran
-f77
-gdbm
-gpm
-imlib
-ipv6
-libwww
-ncurses
-nls
-pam
-perl
-pic
-python
-readline
-spell
-ssl
-tcpd
-xml2
-zlib
-"
-
-GRP_STAGE23_USE="${USE}"
-
diff --git a/profiles/default-linux/hppa/2005.0/make.defaults b/profiles/default-linux/hppa/2005.0/make.defaults
deleted file mode 100644
index d34ffff9b392..000000000000
--- a/profiles/default-linux/hppa/2005.0/make.defaults
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/2005.0/make.defaults,v 1.1 2005/01/11 15:53:22 wolf31o2 Exp $
-#
-# System-wide defaults for the Portage system
-# See portage(5) manpage
-
-# System-wide defaults for the Portage system
-
-USE="
-berkdb
-crypt
-cups
-foomaticdb
-fortran
-f77
-gdbm
-gpm
-imlib
-ipv6
-libwww
-ncurses
-nls
-pam
-perl
-pic
-python
-readline
-spell
-ssl
-tcpd
-xml2
-zlib
-"
-
-GRP_STAGE23_USE="${USE}"
-
diff --git a/profiles/default-linux/hppa/make.defaults b/profiles/default-linux/hppa/make.defaults
index 5f9928c7b873..31e5b2e2d9e3 100644
--- a/profiles/default-linux/hppa/make.defaults
+++ b/profiles/default-linux/hppa/make.defaults
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/make.defaults,v 1.1 2005/01/06 10:49:42 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default-linux/hppa/make.defaults,v 1.2 2005/03/05 17:00:00 wolf31o2 Exp $
 #
 # System-wide defaults for the Portage system
 # See portage(5) manpage
@@ -11,3 +11,5 @@ ARCH="hppa"
 ACCEPT_KEYWORDS="hppa"
 
 FEATURES="sandbox sfperms strict"
+
+USE="berkdb crypt cups foomaticdb fortran f77 gdbm gpm imlib ipv6 libwww ncurses nls pam perl pic python readline spell ssl tcpd xml2 zlib"