From a39d15f5bc2b4a00d7696f548a496dbb7627bb95 Mon Sep 17 00:00:00 2001
From: hasufell <hasufell@hasufell.de>
Date: Thu, 24 Sep 2015 16:14:24 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 paludis/bashrc              | 5 +++--
 paludis/env.conf.d/gcc.conf | 2 --
 profile.csh                 | 2 +-
 profile.env                 | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/paludis/bashrc b/paludis/bashrc
index ff15f23..ad9b404 100644
--- a/paludis/bashrc
+++ b/paludis/bashrc
@@ -2,9 +2,7 @@
 
 ## global settings
 CC="clang"
-BUILD_CC="clang"
 CXX="clang++"
-BUILD_CXX="clang++"
 CFLAGS="-march=core-avx2 -O2 -pipe -Wall -Qunused-arguments -fcolor-diagnostics"
 CXXFLAGS="${CFLAGS}"
 LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu"
@@ -52,3 +50,6 @@ then
 fi
 
 [[ -e /etc/paludis/hooks/setup_pkg_env.bash ]] && . /etc/paludis/hooks/setup_pkg_env.bash
+
+BUILD_CC=${CC}
+BUILD_CXX=${CXX}
diff --git a/paludis/env.conf.d/gcc.conf b/paludis/env.conf.d/gcc.conf
index e115412..4dd2fbd 100644
--- a/paludis/env.conf.d/gcc.conf
+++ b/paludis/env.conf.d/gcc.conf
@@ -1,7 +1,5 @@
 CC=x86_64-pc-linux-gnu-gcc
 CXX=x86_64-pc-linux-gnu-g++
-BUILD_CC=${CC}
-BUILD_CXX=${CXX}
 
 remove-options CFLAGS -Qunused-arguments -fcolor-diagnostics
 remove-options CXXFLAGS -Qunused-arguments -fcolor-diagnostics
diff --git a/profile.csh b/profile.csh
index c6abbf5..156052e 100644
--- a/profile.csh
+++ b/profile.csh
@@ -35,7 +35,7 @@ setenv CG_INC_PATH '/opt/nvidia-cg-toolkit/include'
 setenv CG_LIB_PATH '/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
 setenv HG '/usr/bin/hg'
 setenv CAVE_RESUME_FILE_OPT '--resume-file ~/cave_resume'
-setenv CAVE_SEARCH_INDEX '/var/tmp/paludis/x11-drivers-nvidia-drivers-355.11/temp//cave-search-index'
+setenv CAVE_SEARCH_INDEX '/root/cave-search-index'
 setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
 setenv VBOX_APP_HOME '/usr/lib64/virtualbox'
 setenv XDG_CONFIG_DIRS '/etc/xdg'
diff --git a/profile.env b/profile.env
index f82c60b..41cbca1 100644
--- a/profile.env
+++ b/profile.env
@@ -35,7 +35,7 @@ export CG_INC_PATH='/opt/nvidia-cg-toolkit/include'
 export CG_LIB_PATH='/opt/nvidia-cg-toolkit/lib32:/opt/nvidia-cg-toolkit/lib64'
 export HG='/usr/bin/hg'
 export CAVE_RESUME_FILE_OPT='--resume-file ~/cave_resume'
-export CAVE_SEARCH_INDEX='/var/tmp/paludis/x11-drivers-nvidia-drivers-355.11/temp//cave-search-index'
+export CAVE_SEARCH_INDEX='/root/cave-search-index'
 export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so:/usr/lib32/libfreebl3.so:/usr/lib32/libnssdbm3.so:/usr/lib32/libsoftokn3.so'
 export VBOX_APP_HOME='/usr/lib64/virtualbox'
 export XDG_CONFIG_DIRS='/etc/xdg'