[gentoo-commits] proj/hardened-dev:uclibc commit in: profiles/hardened/linux/uclibc/, profiles/hardened/linux/uclibc/x86/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     0dc0465614259cc6a27ad96e3ee85e6c32e8d6e3
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  3 03:32:11 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jan  3 03:32:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=0dc04656

profiles: relaxing unnecessary USE maskings

---
 profiles/hardened/linux/uclibc/make.defaults       |    2 +-
 profiles/hardened/linux/uclibc/package.use.mask    |    3 ---
 profiles/hardened/linux/uclibc/packages.build      |    1 -
 profiles/hardened/linux/uclibc/x86/make.defaults   |    3 +--
 .../hardened/linux/uclibc/x86/package.use.mask     |    1 +
 5 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
index d479f74..069f068 100644
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ b/profiles/hardened/linux/uclibc/make.defaults
@@ -4,5 +4,5 @@ PORTAGE_LIBC="uClibc"
 ELIBC=uclibc
 FEATURES="sandbox sfperms strict"
 
-USE="ncurses nptl readline zlib uclibc -pam unicode xattr"
+USE="ncurses nptl readline uclibc unicode xattr zlib -pam"
 BOOTSTRAP_USE="${BOOTSTRAP_USE} uclibc"

diff --git a/profiles/hardened/linux/uclibc/package.use.mask b/profiles/hardened/linux/uclibc/package.use.mask
deleted file mode 100644
index cf149a8..0000000
--- a/profiles/hardened/linux/uclibc/package.use.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-dev-lang/python ipv6
-sys-process/psmisc ipv6
-net-misc/iputils ipv6

diff --git a/profiles/hardened/linux/uclibc/packages.build b/profiles/hardened/linux/uclibc/packages.build
deleted file mode 100644
index 3ee34a3..0000000
--- a/profiles/hardened/linux/uclibc/packages.build
+++ /dev/null
@@ -1 +0,0 @@
-sys-apps/shadow

diff --git a/profiles/hardened/linux/uclibc/x86/make.defaults b/profiles/hardened/linux/uclibc/x86/make.defaults
index 0c8f59e..48a2633 100644
--- a/profiles/hardened/linux/uclibc/x86/make.defaults
+++ b/profiles/hardened/linux/uclibc/x86/make.defaults
@@ -1,7 +1,6 @@
 ARCH="x86"
 ACCEPT_KEYWORDS="x86"
 CHOST="i386-gentoo-linux-uclibc"
-UCLIBC_CPU_DEFAULT="GENERIC_386"
 
-USE="ncurses readline zlib uclibc hardened pic"
+USE="hardened ncurses pic readline uclibc zlib"
 BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic"

diff --git a/profiles/hardened/linux/uclibc/x86/package.use.mask b/profiles/hardened/linux/uclibc/x86/package.use.mask
new file mode 100644
index 0000000..0388180
--- /dev/null
+++ b/profiles/hardened/linux/uclibc/x86/package.use.mask
@@ -0,0 +1 @@
+net-misc/iputils ipv6