- profile cleanups

7 files changed, 11 insertions, 74 deletions

diff --git a/profiles/hardened/amd64/make.defaults b/profiles/hardened/amd64/make.defaults
index 95ab3277be36..6b39592f1e12 100644
--- a/profiles/hardened/amd64/make.defaults
+++ b/profiles/hardened/amd64/make.defaults
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/make.defaults,v 1.6 2005/04/18 19:07:22 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/amd64/make.defaults,v 1.7 2005/07/04 16:58:54 solar Exp $
 
 ARCH="amd64"
 ACCEPT_KEYWORDS="${ARCH}"
-GRP_STAGE23_USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic  hardened nls justify userlocales"
-USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic  hardened nls justify userlocales"
+GRP_STAGE23_USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic hardened nls justify userlocales"
+USE="${ARCH} berkdb crypt readline ssl tcpd zlib pam pic hardened nls justify userlocales"
 MULTILIB_ABIS="amd64"
 
 # amd64
diff --git a/profiles/hardened/amd64/packages b/profiles/hardened/amd64/packages
index 6cafb37c2b62..886eb2a00773 100644
--- a/profiles/hardened/amd64/packages
+++ b/profiles/hardened/amd64/packages
@@ -10,8 +10,8 @@
 *dev-lang/python
 
 >=x11-base/xorg-x11-4.3.0-r6
-# sash - static shell for system recovery
-*app-shells/sash
+# busybox for system recovery
+*sys-apps/busybox
 *dev-lang/perl
 *virtual/editor
 *net-misc/dhcpcd
diff --git a/profiles/hardened/amd64/packages.build b/profiles/hardened/amd64/packages.build
deleted file mode 100644
index 1c2d90ea68a7..000000000000
--- a/profiles/hardened/amd64/packages.build
+++ /dev/null
@@ -1,29 +0,0 @@
-app-arch/bzip2
-app-arch/gzip
-app-arch/tar
-app-editors/nano
-app-shells/bash
-dev-lang/python
-net-misc/rsync
-net-misc/wget
-sys-apps/baselayout
-sys-apps/coreutils
-sys-apps/debianutils
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/net-tools
-sys-apps/portage
-sys-apps/sed
-sys-apps/texinfo
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-sys-devel/gettext
-sys-devel/make
-sys-devel/patch
-sys-libs/glibc
diff --git a/profiles/hardened/make.defaults b/profiles/hardened/make.defaults
index 7c64fbabb86b..0f0302e5f8de 100644
--- a/profiles/hardened/make.defaults
+++ b/profiles/hardened/make.defaults
@@ -1 +1 @@
-STAGE1_USE="hardened pic "
+STAGE1_USE="hardened pic"
diff --git a/profiles/hardened/x86/2.6/make.defaults b/profiles/hardened/x86/2.6/make.defaults
index df53bbff7b53..b2de41a4454e 100644
--- a/profiles/hardened/x86/2.6/make.defaults
+++ b/profiles/hardened/x86/2.6/make.defaults
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/make.defaults,v 1.5 2005/04/18 19:07:22 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/2.6/make.defaults,v 1.6 2005/07/04 16:58:55 solar Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="${ARCH}"
-GRP_STAGE23_USE="${ARCH} berkdb crypt readline nls ssl tcpd zlib pam pic  hardened dlloader"
+GRP_STAGE23_USE="${ARCH} berkdb crypt readline nls ssl tcpd zlib pam pic hardened dlloader"
 USE="${ARCH} berkdb crypt dlloader hardened nls pam pic readline ssl tcpd zlib"
 PORTDIR=/usr/portage/
 PKGDIR=${PORTDIR}/packages/${ARCH}/
diff --git a/profiles/hardened/x86/make.defaults b/profiles/hardened/x86/make.defaults
index 8e20c943232a..b8bc743536d5 100644
--- a/profiles/hardened/x86/make.defaults
+++ b/profiles/hardened/x86/make.defaults
@@ -1,11 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.11 2005/04/18 19:07:22 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/make.defaults,v 1.12 2005/07/04 16:58:54 solar Exp $
 
 ARCH="x86"
 ACCEPT_KEYWORDS="${ARCH}"
-GRP_STAGE23_USE="${ARCH} berkdb crypt readline nls ssl tcpd zlib pam pic  hardened dlloader userlocales"
-USE="${ARCH} berkdb crypt dlloader hardened nls pam pic readline ssl tcpd zlib userlocales"
+USE="${ARCH} berkdb crypt dlloader hardened nls pam pic readline ssl tcpd userlocales zlib"
+GRP_STAGE23_USE="${ARCH} ${USE}"
 PORTDIR=/usr/portage/
 PKGDIR=${PORTDIR}/packages/${ARCH}/
 
diff --git a/profiles/hardened/x86/packages.build b/profiles/hardened/x86/packages.build
deleted file mode 100644
index 60ba8477815a..000000000000
--- a/profiles/hardened/x86/packages.build
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/x86/packages.build,v 1.3 2005/05/23 18:11:01 seemant Exp $
-
-app-arch/bzip2
-app-arch/gzip
-app-arch/tar
-app-editors/nano
-app-shells/bash
-dev-lang/python
-net-misc/rsync
-net-misc/wget
-sys-apps/baselayout
-sys-apps/coreutils
-sys-apps/debianutils
-sys-apps/diffutils
-sys-apps/file
-sys-apps/findutils
-sys-apps/gawk
-sys-apps/grep
-sys-apps/less
-sys-apps/net-tools
-sys-apps/portage
-sys-apps/sed
-sys-apps/texinfo
-sys-devel/binutils
-sys-devel/bison
-sys-devel/flex
-sys-devel/gcc
-sys-devel/gettext
-sys-devel/make
-sys-devel/patch
-sys-libs/glibc
-