From ce5875d2fd418e631b753fa255bfd029bfd38edb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 17:14:15 +0100 Subject: Revert "allow some customisation for advanced users" This reverts commit a07eb1e2ef7a424c2f7ada9203fcc96f307b3958. --- conf/intel/portage/make.conf.amd64-binmode | 16 +++++++++++++++- conf/intel/portage/make.conf.amd64-mixedmode | 17 ++++++++++++++++- conf/intel/portage/make.conf.amd64-srcmode | 17 ++++++++++++++++- 3 files changed, 47 insertions(+), 3 deletions(-) diff --git a/conf/intel/portage/make.conf.amd64-binmode b/conf/intel/portage/make.conf.amd64-binmode index f6888ea..b082e7e 100644 --- a/conf/intel/portage/make.conf.amd64-binmode +++ b/conf/intel/portage/make.conf.amd64-binmode @@ -3,7 +3,21 @@ 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/*.conf +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 ## 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 index 8cff01a..6ad5c55 100644 --- a/conf/intel/portage/make.conf.amd64-mixedmode +++ b/conf/intel/portage/make.conf.amd64-mixedmode @@ -3,7 +3,22 @@ FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug - EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --getbinpkg --rebuilt-binaries" ## PORTAGE FLAGS ## -source /etc/portage/global.conf/*.conf +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 ## 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 index 2a1a8c5..74401c6 100644 --- a/conf/intel/portage/make.conf.amd64-srcmode +++ b/conf/intel/portage/make.conf.amd64-srcmode @@ -2,4 +2,19 @@ FEATURES="parallel-fetch protect-owned candy buildpkg compressdebug splitdebug -userpriv" ## PORTAGE FLAGS ## -source /etc/portage/global.conf/*.conf +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 -- cgit v1.2.3