switch to new layout

23 files changed, 2 insertions, 94 deletions

diff --git a/conf/intel/portage/make.conf.amd64-binmode b/conf/intel/portage/make.conf.amd64-binmode
deleted file mode 100644
index 6387dc8..0000000
--- a/conf/intel/portage/make.conf.amd64-binmode
+++ /dev/null
@@ -1,24 +0,0 @@
-## PORTAGE FEATURES ##
-FEATURES="parallel-fetch protect-owned candy compressdebug splitdebug -userpriv"
-EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkgonly --rebuilt-binaries"
-
-## PORTAGE FLAGS ##
-source /etc/portage/global.conf/abi.conf
-source /etc/portage/global.conf/cflags.conf
-source /etc/portage/global.conf/cpuflags.conf
-source /etc/portage/global.conf/devices.conf
-source /etc/portage/global.conf/distfiles.conf
-source /etc/portage/global.conf/generic.conf
-source /etc/portage/global.conf/grub.conf
-source /etc/portage/global.conf/languages.conf
-source /etc/portage/global.conf/layout.conf
-source /etc/portage/global.conf/libreoffice.conf
-source /etc/portage/global.conf/llvm.conf
-source /etc/portage/global.conf/python.conf
-source /etc/portage/global.conf/qemu.conf
-source /etc/portage/global.conf/ruby.conf
-source /etc/portage/global.conf/useflags.conf
-source /etc/portage/global.conf/zz-custom.conf
-
-## SISYPHUS MIRRORS ##
-source /etc/sisyphus/mirrors.conf
diff --git a/conf/intel/portage/make.conf.amd64-generic b/conf/intel/portage/make.conf.amd64-generic
deleted file mode 100644
index 337e7ec..0000000
--- a/conf/intel/portage/make.conf.amd64-generic
+++ /dev/null
@@ -1,24 +0,0 @@
-## PORTAGE FEATURES ##
-FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv"
-
-## PORTAGE FLAGS ##
-source /etc/portage/global.conf/abi.conf
-source /etc/portage/global.conf/cflags.conf
-source /etc/portage/global.conf/cpuflags.conf
-source /etc/portage/global.conf/devices.conf
-source /etc/portage/global.conf/distfiles.conf
-source /etc/portage/global.conf/generic.conf
-source /etc/portage/global.conf/grub.conf
-source /etc/portage/global.conf/languages.conf
-source /etc/portage/global.conf/layout.conf
-source /etc/portage/global.conf/libreoffice.conf
-source /etc/portage/global.conf/llvm.conf
-source /etc/portage/global.conf/makeopts.conf
-source /etc/portage/global.conf/python.conf
-source /etc/portage/global.conf/qemu.conf
-source /etc/portage/global.conf/ruby.conf
-source /etc/portage/global.conf/useflags.conf
-source /etc/portage/global.conf/zz-custom.conf
-
-## SISYPHUS MIRRORS ##
-source /etc/sisyphus/mirrors.conf
diff --git a/conf/intel/portage/make.conf.amd64-mixedmode b/conf/intel/portage/make.conf.amd64-mixedmode
deleted file mode 100644
index 3731006..0000000
--- a/conf/intel/portage/make.conf.amd64-mixedmode
+++ /dev/null
@@ -1,25 +0,0 @@
-## PORTAGE FEATURES ##
-FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv"
-EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkg --rebuilt-binaries"
-
-## PORTAGE FLAGS ##
-source /etc/portage/global.conf/abi.conf
-source /etc/portage/global.conf/cflags.conf
-source /etc/portage/global.conf/cpuflags.conf
-source /etc/portage/global.conf/devices.conf
-source /etc/portage/global.conf/distfiles.conf
-source /etc/portage/global.conf/generic.conf
-source /etc/portage/global.conf/grub.conf
-source /etc/portage/global.conf/languages.conf
-source /etc/portage/global.conf/layout.conf
-source /etc/portage/global.conf/libreoffice.conf
-source /etc/portage/global.conf/llvm.conf
-source /etc/portage/global.conf/makeopts.conf
-source /etc/portage/global.conf/python.conf
-source /etc/portage/global.conf/qemu.conf
-source /etc/portage/global.conf/ruby.conf
-source /etc/portage/global.conf/useflags.conf
-source /etc/portage/global.conf/zz-custom.conf
-
-## SISYPHUS MIRRORS ##
-source /etc/sisyphus/mirrors.conf
diff --git a/conf/intel/portage/make.conf.amd64-srcmode b/conf/intel/portage/make.conf.amd64-srcmode
deleted file mode 100644
index 3348ce4..0000000
--- a/conf/intel/portage/make.conf.amd64-srcmode
+++ /dev/null
@@ -1,21 +0,0 @@
-## PORTAGE FEATURES ##
-FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv"
-
-## PORTAGE FLAGS ##
-source /etc/portage/global.conf/abi.conf
-source /etc/portage/global.conf/cflags.conf
-source /etc/portage/global.conf/cpuflags.conf
-source /etc/portage/global.conf/devices.conf
-source /etc/portage/global.conf/distfiles.conf
-source /etc/portage/global.conf/generic.conf
-source /etc/portage/global.conf/grub.conf
-source /etc/portage/global.conf/languages.conf
-source /etc/portage/global.conf/layout.conf
-source /etc/portage/global.conf/libreoffice.conf
-source /etc/portage/global.conf/llvm.conf
-source /etc/portage/global.conf/makeopts.conf
-source /etc/portage/global.conf/python.conf
-source /etc/portage/global.conf/qemu.conf
-source /etc/portage/global.conf/ruby.conf
-source /etc/portage/global.conf/useflags.conf
-source /etc/portage/global.conf/zz-custom.conf
diff --git a/conf/intel/portage/global.conf/abi.conf b/conf/intel/portage/make.conf/abi.conf
index 2973060..2973060 100644
--- a/conf/intel/portage/global.conf/abi.conf
+++ b/conf/intel/portage/make.conf/abi.conf
diff --git a/conf/intel/portage/global.conf/cflags.conf b/conf/intel/portage/make.conf/cflags.conf
index 0872985..0872985 100644
--- a/conf/intel/portage/global.conf/cflags.conf
+++ b/conf/intel/portage/make.conf/cflags.conf
diff --git a/conf/intel/portage/global.conf/cpuflags.conf b/conf/intel/portage/make.conf/cpuflags.conf
index c9588f3..c9588f3 100644
--- a/conf/intel/portage/global.conf/cpuflags.conf
+++ b/conf/intel/portage/make.conf/cpuflags.conf
diff --git a/conf/intel/portage/global.conf/devices.conf b/conf/intel/portage/make.conf/devices.conf
index 224f065..224f065 100644
--- a/conf/intel/portage/global.conf/devices.conf
+++ b/conf/intel/portage/make.conf/devices.conf
diff --git a/conf/intel/portage/global.conf/distfiles.conf b/conf/intel/portage/make.conf/distfiles.conf
index 755228b..755228b 100644
--- a/conf/intel/portage/global.conf/distfiles.conf
+++ b/conf/intel/portage/make.conf/distfiles.conf
diff --git a/conf/intel/portage/make.conf/features.conf b/conf/intel/portage/make.conf/features.conf
new file mode 100644
index 0000000..84d97ba
--- /dev/null
+++ b/conf/intel/portage/make.conf/features.conf
@@ -0,0 +1 @@
+FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv"
diff --git a/conf/intel/portage/global.conf/generic.conf b/conf/intel/portage/make.conf/generic.conf
index 0003b26..0003b26 100644
--- a/conf/intel/portage/global.conf/generic.conf
+++ b/conf/intel/portage/make.conf/generic.conf
diff --git a/conf/intel/portage/global.conf/grub.conf b/conf/intel/portage/make.conf/grub.conf
index 2ce1670..2ce1670 100644
--- a/conf/intel/portage/global.conf/grub.conf
+++ b/conf/intel/portage/make.conf/grub.conf
diff --git a/conf/intel/portage/global.conf/languages.conf b/conf/intel/portage/make.conf/languages.conf
index b32944f..b32944f 100644
--- a/conf/intel/portage/global.conf/languages.conf
+++ b/conf/intel/portage/make.conf/languages.conf
diff --git a/conf/intel/portage/global.conf/layout.conf b/conf/intel/portage/make.conf/layout.conf
index 82d8631..82d8631 100644
--- a/conf/intel/portage/global.conf/layout.conf
+++ b/conf/intel/portage/make.conf/layout.conf
diff --git a/conf/intel/portage/global.conf/libreoffice.conf b/conf/intel/portage/make.conf/libreoffice.conf
index e3e8c26..e3e8c26 100644
--- a/conf/intel/portage/global.conf/libreoffice.conf
+++ b/conf/intel/portage/make.conf/libreoffice.conf
diff --git a/conf/intel/portage/global.conf/llvm.conf b/conf/intel/portage/make.conf/llvm.conf
index b3f04f4..b3f04f4 100644
--- a/conf/intel/portage/global.conf/llvm.conf
+++ b/conf/intel/portage/make.conf/llvm.conf
diff --git a/conf/intel/portage/global.conf/makeopts.conf b/conf/intel/portage/make.conf/makeopts.conf
index fea6527..fea6527 100644
--- a/conf/intel/portage/global.conf/makeopts.conf
+++ b/conf/intel/portage/make.conf/makeopts.conf
diff --git a/conf/intel/portage/make.conf/mirrors.conf b/conf/intel/portage/make.conf/mirrors.conf
new file mode 100644
index 0000000..2607d30
--- /dev/null
+++ b/conf/intel/portage/make.conf/mirrors.conf
@@ -0,0 +1 @@
+source /etc/sisyphus/mirrors.conf
diff --git a/conf/intel/portage/global.conf/python.conf b/conf/intel/portage/make.conf/python.conf
index f36c4b2..f36c4b2 100644
--- a/conf/intel/portage/global.conf/python.conf
+++ b/conf/intel/portage/make.conf/python.conf
diff --git a/conf/intel/portage/global.conf/qemu.conf b/conf/intel/portage/make.conf/qemu.conf
index a38f2a3..a38f2a3 100644
--- a/conf/intel/portage/global.conf/qemu.conf
+++ b/conf/intel/portage/make.conf/qemu.conf
diff --git a/conf/intel/portage/global.conf/ruby.conf b/conf/intel/portage/make.conf/ruby.conf
index 55f8b07..55f8b07 100644
--- a/conf/intel/portage/global.conf/ruby.conf
+++ b/conf/intel/portage/make.conf/ruby.conf
diff --git a/conf/intel/portage/global.conf/useflags.conf b/conf/intel/portage/make.conf/useflags.conf
index 11d1522..11d1522 100644
--- a/conf/intel/portage/global.conf/useflags.conf
+++ b/conf/intel/portage/make.conf/useflags.conf
diff --git a/conf/intel/portage/global.conf/zz-custom.conf b/conf/intel/portage/make.conf/zz-custom.conf
index e69de29..e69de29 100644
--- a/conf/intel/portage/global.conf/zz-custom.conf
+++ b/conf/intel/portage/make.conf/zz-custom.conf