base: Reduce number of env conf files

Signed-off-by: Matt Turner <mattst88@gmail.com>

35 files changed, 28 insertions, 451 deletions

diff --git a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/gcc.conf b/base/etc/portage/env/cross-alpha-unknown-linux-gnu/gcc.conf
deleted file mode 100644
index dcd943f..0000000
--- a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/gcc.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-TARGET_ABI='default'
-TARGET_MULTILIB_ABIS='default'
-TARGET_DEFAULT_ABI='default'
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='alpha-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='amd64'
-MULTILIB_ABIS='amd64'
-DEFAULT_ABI='amd64'
diff --git a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/binutils.conf b/base/etc/portage/env/cross-alpha-unknown-linux-gnu/host.conf
index dcd943f..dcd943f 100644
--- a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/binutils.conf
+++ b/base/etc/portage/env/cross-alpha-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/linux-headers.conf b/base/etc/portage/env/cross-alpha-unknown-linux-gnu/linux-headers.conf
deleted file mode 100644
index 095826e..0000000
--- a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/linux-headers.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='alpha-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='default'
-MULTILIB_ABIS='default'
-DEFAULT_ABI='default'
diff --git a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/glibc.conf b/base/etc/portage/env/cross-alpha-unknown-linux-gnu/target.conf
index 095826e..095826e 100644
--- a/base/etc/portage/env/cross-alpha-unknown-linux-gnu/glibc.conf
+++ b/base/etc/portage/env/cross-alpha-unknown-linux-gnu/target.conf
diff --git a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/gcc.conf b/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/gcc.conf
deleted file mode 100644
index 4a431e7..0000000
--- a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/gcc.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-TARGET_ABI='default'
-TARGET_MULTILIB_ABIS='default'
-TARGET_DEFAULT_ABI='default'
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='armv7a-unknown-linux-gnueabihf'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='amd64'
-MULTILIB_ABIS='amd64'
-DEFAULT_ABI='amd64'
diff --git a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/binutils.conf b/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/host.conf
index 4a431e7..4a431e7 100644
--- a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/binutils.conf
+++ b/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/host.conf
diff --git a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/linux-headers.conf b/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/linux-headers.conf
deleted file mode 100644
index 59478d3..0000000
--- a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/linux-headers.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='armv7a-unknown-linux-gnueabihf'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='default'
-MULTILIB_ABIS='default'
-DEFAULT_ABI='default'
diff --git a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/glibc.conf b/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/target.conf
index 59478d3..59478d3 100644
--- a/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/glibc.conf
+++ b/base/etc/portage/env/cross-armv7a-unknown-linux-gnueabihf/target.conf
diff --git a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/gcc.conf b/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/gcc.conf
deleted file mode 100644
index a79fc36..0000000
--- a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/gcc.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-TARGET_ABI='default'
-TARGET_MULTILIB_ABIS='default'
-TARGET_DEFAULT_ABI='default'
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='hppa2.0-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='amd64'
-MULTILIB_ABIS='amd64'
-DEFAULT_ABI='amd64'
diff --git a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/binutils.conf b/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/host.conf
index a79fc36..a79fc36 100644
--- a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/binutils.conf
+++ b/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/linux-headers.conf b/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/linux-headers.conf
deleted file mode 100644
index 95da086..0000000
--- a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/linux-headers.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='hppa2.0-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='default'
-MULTILIB_ABIS='default'
-DEFAULT_ABI='default'
diff --git a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/glibc.conf b/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/target.conf
index 95da086..95da086 100644
--- a/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/glibc.conf
+++ b/base/etc/portage/env/cross-hppa2.0-unknown-linux-gnu/target.conf
diff --git a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/gcc.conf b/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/gcc.conf
deleted file mode 100644
index b1450df..0000000
--- a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/gcc.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-TARGET_ABI='default'
-TARGET_MULTILIB_ABIS='default'
-TARGET_DEFAULT_ABI='default'
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='hppa64-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='amd64'
-MULTILIB_ABIS='amd64'
-DEFAULT_ABI='amd64'
diff --git a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/binutils.conf b/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/host.conf
index b1450df..b1450df 100644
--- a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/binutils.conf
+++ b/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/linux-headers.conf b/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/linux-headers.conf
deleted file mode 100644
index 671fe75..0000000
--- a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/linux-headers.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='hppa64-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='default'
-MULTILIB_ABIS='default'
-DEFAULT_ABI='default'
diff --git a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/glibc.conf b/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/target.conf
index 671fe75..671fe75 100644
--- a/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/glibc.conf
+++ b/base/etc/portage/env/cross-hppa64-unknown-linux-gnu/target.conf
diff --git a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/gcc.conf b/base/etc/portage/env/cross-mips64-unknown-linux-gnu/gcc.conf
deleted file mode 100644
index 32c757e..0000000
--- a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/gcc.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-TARGET_ABI='n32'
-TARGET_MULTILIB_ABIS='n32 n64 o32'
-TARGET_DEFAULT_ABI='n32'
-CFLAGS_amd64='-m64'
-CFLAGS_n32='-mabi=n32'
-CFLAGS_n64='-mabi=64'
-CFLAGS_o32='-mabi=32'
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_n32='mips64-unknown-linux-gnu'
-CHOST_n64='mips64-unknown-linux-gnu'
-CHOST_o32='mips-unknown-linux-gnu'
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='mips64-unknown-linux-gnu'
-CTARGET_n32='mips64-unknown-linux-gnu'
-CTARGET_n64='mips64-unknown-linux-gnu'
-CTARGET_o32='mips-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_n32=''
-LDFLAGS_n64=''
-LDFLAGS_o32=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_n32='lib32'
-LIBDIR_n64='lib64'
-LIBDIR_o32='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='amd64'
-MULTILIB_ABIS='amd64'
-DEFAULT_ABI='amd64'
diff --git a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/binutils.conf b/base/etc/portage/env/cross-mips64-unknown-linux-gnu/host.conf
index 32c757e..32c757e 100644
--- a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/binutils.conf
+++ b/base/etc/portage/env/cross-mips64-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/linux-headers.conf b/base/etc/portage/env/cross-mips64-unknown-linux-gnu/linux-headers.conf
deleted file mode 100644
index 1f34a7b..0000000
--- a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/linux-headers.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-CFLAGS_amd64='-m64'
-CFLAGS_n32='-mabi=n32'
-CFLAGS_n64='-mabi=64'
-CFLAGS_o32='-mabi=32'
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_n32='mips64-unknown-linux-gnu'
-CHOST_n64='mips64-unknown-linux-gnu'
-CHOST_o32='mips-unknown-linux-gnu'
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='mips64-unknown-linux-gnu'
-CTARGET_n32='mips64-unknown-linux-gnu'
-CTARGET_n64='mips64-unknown-linux-gnu'
-CTARGET_o32='mips-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_n32=''
-LDFLAGS_n64=''
-LDFLAGS_o32=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_n32='lib32'
-LIBDIR_n64='lib64'
-LIBDIR_o32='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='n32'
-MULTILIB_ABIS='n32 n64 o32'
-DEFAULT_ABI='n32'
diff --git a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/glibc.conf b/base/etc/portage/env/cross-mips64-unknown-linux-gnu/target.conf
index 1f34a7b..1f34a7b 100644
--- a/base/etc/portage/env/cross-mips64-unknown-linux-gnu/glibc.conf
+++ b/base/etc/portage/env/cross-mips64-unknown-linux-gnu/target.conf
diff --git a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/gcc.conf b/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/gcc.conf
deleted file mode 100644
index 2347596..0000000
--- a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/gcc.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-TARGET_ABI='n32'
-TARGET_MULTILIB_ABIS='n32 n64 o32'
-TARGET_DEFAULT_ABI='n32'
-CFLAGS_amd64='-m64'
-CFLAGS_n32='-mabi=n32'
-CFLAGS_n64='-mabi=64'
-CFLAGS_o32='-mabi=32'
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_n32='mips64el-unknown-linux-gnu'
-CHOST_n64='mips64el-unknown-linux-gnu'
-CHOST_o32='mipsel-unknown-linux-gnu'
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='mips64el-unknown-linux-gnu'
-CTARGET_n32='mips64el-unknown-linux-gnu'
-CTARGET_n64='mips64el-unknown-linux-gnu'
-CTARGET_o32='mipsel-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_n32=''
-LDFLAGS_n64=''
-LDFLAGS_o32=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_n32='lib32'
-LIBDIR_n64='lib64'
-LIBDIR_o32='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='amd64'
-MULTILIB_ABIS='amd64'
-DEFAULT_ABI='amd64'
diff --git a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/binutils.conf b/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/host.conf
index 2347596..2347596 100644
--- a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/binutils.conf
+++ b/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/linux-headers.conf b/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/linux-headers.conf
deleted file mode 100644
index eb94481..0000000
--- a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/linux-headers.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-CFLAGS_amd64='-m64'
-CFLAGS_n32='-mabi=n32'
-CFLAGS_n64='-mabi=64'
-CFLAGS_o32='-mabi=32'
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_n32='mips64el-unknown-linux-gnu'
-CHOST_n64='mips64el-unknown-linux-gnu'
-CHOST_o32='mipsel-unknown-linux-gnu'
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='mips64el-unknown-linux-gnu'
-CTARGET_n32='mips64el-unknown-linux-gnu'
-CTARGET_n64='mips64el-unknown-linux-gnu'
-CTARGET_o32='mipsel-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_n32=''
-LDFLAGS_n64=''
-LDFLAGS_o32=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_n32='lib32'
-LIBDIR_n64='lib64'
-LIBDIR_o32='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='n32'
-MULTILIB_ABIS='n32 n64 o32'
-DEFAULT_ABI='n32'
diff --git a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/glibc.conf b/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/target.conf
index eb94481..eb94481 100644
--- a/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/glibc.conf
+++ b/base/etc/portage/env/cross-mips64el-unknown-linux-gnu/target.conf
diff --git a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/gcc.conf b/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/gcc.conf
deleted file mode 100644
index be55881..0000000
--- a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/gcc.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-TARGET_ABI='default'
-TARGET_MULTILIB_ABIS='default'
-TARGET_DEFAULT_ABI='default'
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='powerpc-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='amd64'
-MULTILIB_ABIS='amd64'
-DEFAULT_ABI='amd64'
diff --git a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/binutils.conf b/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/host.conf
index be55881..be55881 100644
--- a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/binutils.conf
+++ b/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/linux-headers.conf b/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/linux-headers.conf
deleted file mode 100644
index f369a31..0000000
--- a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/linux-headers.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-SYMLINK_LIB=no
-COLLISION_IGNORE="${COLLISION_IGNORE} /usr/lib/debug/.build-id"
-
-
-CFLAGS_amd64='-m64'
-CFLAGS_default=''
-CFLAGS_x32='-mx32'
-CFLAGS_x86='-m32'
-CHOST_amd64='x86_64-pc-linux-gnu'
-CHOST_default=''
-CHOST_x32='x86_64-pc-linux-gnux32'
-CHOST_x86='i686-pc-linux-gnu'
-CTARGET_amd64='x86_64-pc-linux-gnu'
-CTARGET_default='powerpc-unknown-linux-gnu'
-CTARGET_x32='x86_64-pc-linux-gnux32'
-CTARGET_x86='i686-pc-linux-gnu'
-LDFLAGS_amd64=''
-LDFLAGS_default=''
-LIBDIR_amd64='lib64'
-LIBDIR_default='lib'
-LIBDIR_x32='libx32'
-LIBDIR_x86='lib'
-ABI='default'
-MULTILIB_ABIS='default'
-DEFAULT_ABI='default'
diff --git a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/glibc.conf b/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/target.conf
index f369a31..f369a31 100644
--- a/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/glibc.conf
+++ b/base/etc/portage/env/cross-powerpc-unknown-linux-gnu/target.conf
diff --git a/base/etc/portage/package.env/cross-alpha-unknown-linux-gnu b/base/etc/portage/package.env/cross-alpha-unknown-linux-gnu
index 3b372bd..2eaa0d3 100644
--- a/base/etc/portage/package.env/cross-alpha-unknown-linux-gnu
+++ b/base/etc/portage/package.env/cross-alpha-unknown-linux-gnu
@@ -1,4 +1,4 @@
-cross-alpha-unknown-linux-gnu/binutils cross-alpha-unknown-linux-gnu/binutils.conf
-cross-alpha-unknown-linux-gnu/gcc cross-alpha-unknown-linux-gnu/gcc.conf
-cross-alpha-unknown-linux-gnu/linux-headers cross-alpha-unknown-linux-gnu/linux-headers.conf
-cross-alpha-unknown-linux-gnu/glibc cross-alpha-unknown-linux-gnu/glibc.conf
+cross-alpha-unknown-linux-gnu/binutils cross-alpha-unknown-linux-gnu/host.conf
+cross-alpha-unknown-linux-gnu/gcc cross-alpha-unknown-linux-gnu/host.conf
+cross-alpha-unknown-linux-gnu/linux-headers cross-alpha-unknown-linux-gnu/host.conf
+cross-alpha-unknown-linux-gnu/glibc cross-alpha-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/package.env/cross-armv7a-unknown-linux-gnueabihf b/base/etc/portage/package.env/cross-armv7a-unknown-linux-gnueabihf
index 35c2ee4..af12844 100644
--- a/base/etc/portage/package.env/cross-armv7a-unknown-linux-gnueabihf
+++ b/base/etc/portage/package.env/cross-armv7a-unknown-linux-gnueabihf
@@ -1,4 +1,4 @@
-cross-armv7a-unknown-linux-gnueabihf/binutils cross-armv7a-unknown-linux-gnueabihf/binutils.conf
-cross-armv7a-unknown-linux-gnueabihf/gcc cross-armv7a-unknown-linux-gnueabihf/gcc.conf
-cross-armv7a-unknown-linux-gnueabihf/linux-headers cross-armv7a-unknown-linux-gnueabihf/linux-headers.conf
-cross-armv7a-unknown-linux-gnueabihf/glibc cross-armv7a-unknown-linux-gnueabihf/glibc.conf
+cross-armv7a-unknown-linux-gnueabihf/binutils cross-armv7a-unknown-linux-gnueabihf/host.conf
+cross-armv7a-unknown-linux-gnueabihf/gcc cross-armv7a-unknown-linux-gnueabihf/host.conf
+cross-armv7a-unknown-linux-gnueabihf/linux-headers cross-armv7a-unknown-linux-gnueabihf/host.conf
+cross-armv7a-unknown-linux-gnueabihf/glibc cross-armv7a-unknown-linux-gnueabihf/host.conf
diff --git a/base/etc/portage/package.env/cross-hppa2.0-unknown-linux-gnu b/base/etc/portage/package.env/cross-hppa2.0-unknown-linux-gnu
index 1af79bc..7ee37e9 100644
--- a/base/etc/portage/package.env/cross-hppa2.0-unknown-linux-gnu
+++ b/base/etc/portage/package.env/cross-hppa2.0-unknown-linux-gnu
@@ -1,4 +1,4 @@
-cross-hppa2.0-unknown-linux-gnu/binutils cross-hppa2.0-unknown-linux-gnu/binutils.conf
-cross-hppa2.0-unknown-linux-gnu/gcc cross-hppa2.0-unknown-linux-gnu/gcc.conf
-cross-hppa2.0-unknown-linux-gnu/linux-headers cross-hppa2.0-unknown-linux-gnu/linux-headers.conf
-cross-hppa2.0-unknown-linux-gnu/glibc cross-hppa2.0-unknown-linux-gnu/glibc.conf
+cross-hppa2.0-unknown-linux-gnu/binutils cross-hppa2.0-unknown-linux-gnu/host.conf
+cross-hppa2.0-unknown-linux-gnu/gcc cross-hppa2.0-unknown-linux-gnu/host.conf
+cross-hppa2.0-unknown-linux-gnu/linux-headers cross-hppa2.0-unknown-linux-gnu/host.conf
+cross-hppa2.0-unknown-linux-gnu/glibc cross-hppa2.0-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/package.env/cross-hppa64-unknown-linux-gnu b/base/etc/portage/package.env/cross-hppa64-unknown-linux-gnu
index 0f6549a..ba4ba7a 100644
--- a/base/etc/portage/package.env/cross-hppa64-unknown-linux-gnu
+++ b/base/etc/portage/package.env/cross-hppa64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-cross-hppa64-unknown-linux-gnu/binutils cross-hppa64-unknown-linux-gnu/binutils.conf
-cross-hppa64-unknown-linux-gnu/gcc cross-hppa64-unknown-linux-gnu/gcc.conf
-cross-hppa64-unknown-linux-gnu/linux-headers cross-hppa64-unknown-linux-gnu/linux-headers.conf
-cross-hppa64-unknown-linux-gnu/glibc cross-hppa64-unknown-linux-gnu/glibc.conf
+cross-hppa64-unknown-linux-gnu/binutils cross-hppa64-unknown-linux-gnu/host.conf
+cross-hppa64-unknown-linux-gnu/gcc cross-hppa64-unknown-linux-gnu/host.conf
+cross-hppa64-unknown-linux-gnu/linux-headers cross-hppa64-unknown-linux-gnu/host.conf
+cross-hppa64-unknown-linux-gnu/glibc cross-hppa64-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/package.env/cross-mips64-unknown-linux-gnu b/base/etc/portage/package.env/cross-mips64-unknown-linux-gnu
index 1abb237..f737df1 100644
--- a/base/etc/portage/package.env/cross-mips64-unknown-linux-gnu
+++ b/base/etc/portage/package.env/cross-mips64-unknown-linux-gnu
@@ -1,4 +1,4 @@
-cross-mips64-unknown-linux-gnu/binutils cross-mips64-unknown-linux-gnu/binutils.conf
-cross-mips64-unknown-linux-gnu/gcc cross-mips64-unknown-linux-gnu/gcc.conf
-cross-mips64-unknown-linux-gnu/linux-headers cross-mips64-unknown-linux-gnu/linux-headers.conf
-cross-mips64-unknown-linux-gnu/glibc cross-mips64-unknown-linux-gnu/glibc.conf
+cross-mips64-unknown-linux-gnu/binutils cross-mips64-unknown-linux-gnu/host.conf
+cross-mips64-unknown-linux-gnu/gcc cross-mips64-unknown-linux-gnu/host.conf
+cross-mips64-unknown-linux-gnu/linux-headers cross-mips64-unknown-linux-gnu/host.conf
+cross-mips64-unknown-linux-gnu/glibc cross-mips64-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/package.env/cross-mips64el-unknown-linux-gnu b/base/etc/portage/package.env/cross-mips64el-unknown-linux-gnu
index e378c24..a1333e3 100644
--- a/base/etc/portage/package.env/cross-mips64el-unknown-linux-gnu
+++ b/base/etc/portage/package.env/cross-mips64el-unknown-linux-gnu
@@ -1,4 +1,4 @@
-cross-mips64el-unknown-linux-gnu/binutils cross-mips64el-unknown-linux-gnu/binutils.conf
-cross-mips64el-unknown-linux-gnu/gcc cross-mips64el-unknown-linux-gnu/gcc.conf
-cross-mips64el-unknown-linux-gnu/linux-headers cross-mips64el-unknown-linux-gnu/linux-headers.conf
-cross-mips64el-unknown-linux-gnu/glibc cross-mips64el-unknown-linux-gnu/glibc.conf
+cross-mips64el-unknown-linux-gnu/binutils cross-mips64el-unknown-linux-gnu/host.conf
+cross-mips64el-unknown-linux-gnu/gcc cross-mips64el-unknown-linux-gnu/host.conf
+cross-mips64el-unknown-linux-gnu/linux-headers cross-mips64el-unknown-linux-gnu/host.conf
+cross-mips64el-unknown-linux-gnu/glibc cross-mips64el-unknown-linux-gnu/host.conf
diff --git a/base/etc/portage/package.env/cross-powerpc-unknown-linux-gnu b/base/etc/portage/package.env/cross-powerpc-unknown-linux-gnu
index ae449c1..29b36b5 100644
--- a/base/etc/portage/package.env/cross-powerpc-unknown-linux-gnu
+++ b/base/etc/portage/package.env/cross-powerpc-unknown-linux-gnu
@@ -1,4 +1,4 @@
-cross-powerpc-unknown-linux-gnu/binutils cross-powerpc-unknown-linux-gnu/binutils.conf
-cross-powerpc-unknown-linux-gnu/gcc cross-powerpc-unknown-linux-gnu/gcc.conf
-cross-powerpc-unknown-linux-gnu/linux-headers cross-powerpc-unknown-linux-gnu/linux-headers.conf
-cross-powerpc-unknown-linux-gnu/glibc cross-powerpc-unknown-linux-gnu/glibc.conf
+cross-powerpc-unknown-linux-gnu/binutils cross-powerpc-unknown-linux-gnu/host.conf
+cross-powerpc-unknown-linux-gnu/gcc cross-powerpc-unknown-linux-gnu/host.conf
+cross-powerpc-unknown-linux-gnu/linux-headers cross-powerpc-unknown-linux-gnu/host.conf
+cross-powerpc-unknown-linux-gnu/glibc cross-powerpc-unknown-linux-gnu/host.conf