clean up to fix hardened

10 files changed, 9 insertions, 86 deletions

diff --git a/profiles/uclibc/arm/make.defaults b/profiles/uclibc/arm/make.defaults
index c38c07620dc0..9daaed11fa0f 100644
--- a/profiles/uclibc/arm/make.defaults
+++ b/profiles/uclibc/arm/make.defaults
@@ -1,9 +1,5 @@
 ARCH="arm"
 ACCEPT_KEYWORDS="arm"
 
-GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
-USE="${GRP_STAGE23_USE}"
-STAGE1_USE="uclibc"
-
 UCLIBC_CPU_DEFAULT="GENERIC_ARM"
 UCLIBC_ENDIAN_DEFAULT="LITTLE"
diff --git a/profiles/uclibc/make.defaults b/profiles/uclibc/make.defaults
index fa229c3c588c..3c506f47a1e5 100644
--- a/profiles/uclibc/make.defaults
+++ b/profiles/uclibc/make.defaults
@@ -1,3 +1,5 @@
+STAGE1_USE="uclibc"
+GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
 USE="berkdb ncurses readline zlib uclibc"
 
 PORTAGE_LIBC="uClibc"
diff --git a/profiles/uclibc/mips/hardened/make.defaults b/profiles/uclibc/mips/hardened/make.defaults
index 5d2d78686595..8648620aa6d0 100644
--- a/profiles/uclibc/mips/hardened/make.defaults
+++ b/profiles/uclibc/mips/hardened/make.defaults
@@ -1,10 +1,3 @@
-ARCH="mips"
-ACCEPT_KEYWORDS="mips"
-
-FEATURES="-sandbox"
-GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc hardened pic pie"
-USE="${GRP_STAGE23_USE}"
 STAGE1_USE="uclibc hardened pic pie"
-
-UCLIBC_CPU_DEFAULT="MIPS_ISA_1"
-UCLIBC_ENDIAN_DEFAULT="BIG"
+GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc hardened pic pie"
+USE="berkdb ncurses readline zlib uclibc hardened pic pie"
diff --git a/profiles/uclibc/mips/make.defaults b/profiles/uclibc/mips/make.defaults
index cd3a907ad0e9..0459acf0be83 100644
--- a/profiles/uclibc/mips/make.defaults
+++ b/profiles/uclibc/mips/make.defaults
@@ -2,9 +2,6 @@ ARCH="mips"
 ACCEPT_KEYWORDS="mips"
 
 FEATURES="-sandbox"
-GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
-USE="${GRP_STAGE23_USE}"
-STAGE1_USE="uclibc"
 
 UCLIBC_CPU_DEFAULT="MIPS_ISA_1"
 UCLIBC_ENDIAN_DEFAULT="BIG"
diff --git a/profiles/uclibc/mips/mipsel/make.defaults b/profiles/uclibc/mips/mipsel/make.defaults
index db505432cdb0..65974d431f46 100644
--- a/profiles/uclibc/mips/mipsel/make.defaults
+++ b/profiles/uclibc/mips/mipsel/make.defaults
@@ -1,10 +1 @@
-ARCH="mips"
-ACCEPT_KEYWORDS="mips"
-
-FEATURES="-sandbox"
-GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
-USE="${GRP_STAGE23_USE}"
-STAGE1_USE="uclibc"
-
-UCLIBC_CPU_DEFAULT="MIPS_ISA_1"
 UCLIBC_ENDIAN_DEFAULT="LITTLE"
diff --git a/profiles/uclibc/ppc/hardened/make.defaults b/profiles/uclibc/ppc/hardened/make.defaults
index 7cb605a43b4f..8648620aa6d0 100644
--- a/profiles/uclibc/ppc/hardened/make.defaults
+++ b/profiles/uclibc/ppc/hardened/make.defaults
@@ -1,9 +1,3 @@
-ARCH="ppc"
-ACCEPT_KEYWORDS="ppc"
-
+STAGE1_USE="uclibc hardened pic pie"
 GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc hardened pic pie"
-USE="${GRP_STAGE23_USE}"
-STAGE1_USE="uclibc hardened pic"
-
-UCLIBC_CPU_DEFAULT=""
-UCLIBC_ENDIAN_DEFAULT="BIG"
+USE="berkdb ncurses readline zlib uclibc hardened pic pie"
diff --git a/profiles/uclibc/ppc/make.defaults b/profiles/uclibc/ppc/make.defaults
index 3d7fff1c4a23..c6aded29b0b2 100644
--- a/profiles/uclibc/ppc/make.defaults
+++ b/profiles/uclibc/ppc/make.defaults
@@ -1,9 +1,5 @@
 ARCH="ppc"
 ACCEPT_KEYWORDS="ppc"
 
-GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
-USE="${GRP_STAGE23_USE}"
-STAGE1_USE="uclibc"
-
 UCLIBC_CPU_DEFAULT=""
 UCLIBC_ENDIAN_DEFAULT="BIG"
diff --git a/profiles/uclibc/sh/make.defaults b/profiles/uclibc/sh/make.defaults
index 5b0c4589d670..1fdf8a61a565 100644
--- a/profiles/uclibc/sh/make.defaults
+++ b/profiles/uclibc/sh/make.defaults
@@ -1,9 +1,5 @@
 ARCH="sh"
 ACCEPT_KEYWORDS="sh"
 
-GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
-USE="${GRP_STAGE23_USE}"
-STAGE1_USE="uclibc"
-
 UCLIBC_CPU_DEFAULT="SH4"
 UCLIBC_ENDIAN_DEFAULT="LITTLE"
diff --git a/profiles/uclibc/x86/hardened/make.defaults b/profiles/uclibc/x86/hardened/make.defaults
index b5c34c28d41e..8648620aa6d0 100644
--- a/profiles/uclibc/x86/hardened/make.defaults
+++ b/profiles/uclibc/x86/hardened/make.defaults
@@ -1,42 +1,3 @@
-USE="x86 berkdb crypt ncurses readline ssl tcpd zlib pic pie hardened uclibc"
-STAGE1_USE="uclibc hardened pic"
-GRP_STAGE23_USE="x86 berkdb crypt ncurses readline ssl tcpd zlib pic pie hardened uclibc"
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-# 
-# FEATURES are settings that affect the functionality of portage. Most of
-#     these settings are for developer use, but some are available to non-
-#     developers as well. 
-#
-#  'nodoc'       remove 'doc' in the preinstall phase.
-#                functionality equivalent to rm -rf usr/share/doc/
-#
-#  'noinfo'      remove 'info' pages in the preinstall phase.
-#                functionality equivalent to rm -rf usr/share/info/
-#
-#  'noman'       remove 'man' pages in the preinstall phase.
-#                functionality equivalent to rm -rf usr/share/man/
-#
-#  'sandbox'     enable sandbox-ing when running emerge and ebuild
-#
-#  'sfperms'     feature for security minded people that causes portage to 
-#                remove group+other readable bits on setuid files and
-#                remove the other readable bits on setgid files.
-#
-#  'strict'      causes portage to react strongly to conditions that
-#                have the potential to be dangerous -- like missing or
-#                incorrect Manifest files.
-#
-#  'userpriv'    allows portage to drop root privleges while it is compiling
-#                as a security measure, and as a side effect this can remove 
-#                sandbox access violations for users.
-#
-#  'usersandbox' enables sandboxing while portage is running under userpriv.
-#                unpack -- for debugging purposes only.
-
-FEATURES="sandbox sfperms strict nodoc noinfo noman"
-#FEATURES="${FEATURES} userpriv usersandbox"
-PORTDIR=/usr/portage/
-PKGDIR=${PORTDIR}/packages/${CHOST}/
+STAGE1_USE="uclibc hardened pic pie"
+GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc hardened pic pie"
+USE="berkdb ncurses readline zlib uclibc hardened pic pie"
diff --git a/profiles/uclibc/x86/make.defaults b/profiles/uclibc/x86/make.defaults
index e7a59fbc8320..50e780a7a598 100644
--- a/profiles/uclibc/x86/make.defaults
+++ b/profiles/uclibc/x86/make.defaults
@@ -1,8 +1,5 @@
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
 
-GRP_STAGE23_USE="berkdb ncurses readline zlib uclibc"
-STAGE1_USE="uclibc"
-
 UCLIBC_CPU_DEFAULT="GENERIC_386"
 UCLIBC_ENDIAN_DEFAULT="LITTLE"