saving uncommitted changes in /etc prior to emerge run

diff --git a/csh.env b/csh.env
index 9d40ca9ad189bc66d3c59eb3a8b24a3b5b2e7d58..80f64fe880afd94c62a491da04c6912a6dbfd6ce 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -8,17 +8,17 @@ setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5
 setenv EDITOR '/usr/bin/vim'
 setenv GCC_SPECS ''
 setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/info'
+setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/info'
 setenv LADSPA_PATH '/usr/lib64/ladspa'
 setenv LESS '-R -M --shift 5'
 setenv LESSOPEN '|lesspipe %s'
-setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
+setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
 setenv MULTIOSDIRS '../lib64:../lib32'
 setenv OPENGL_PROFILE 'xorg-x11'
 setenv PAGER '/usr/bin/less'
-setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
 setenv PYTHONDOCS '/usr/share/doc/python-docs-2.7.10/html/library'
 setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.10/html/library'
-setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
 setenv XDG_CONFIG_DIRS '/etc/xdg'
 setenv XDG_DATA_DIRS '/usr/local/share:/usr/share'

diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu
index e9f4b4d8d23f0f42fa3283b7371745bf5a9b65ff..9a2ddad02a65decd37b53dad5aaa61e02b2ad6c6 100644 (file)
--- a/env.d/04gcc-x86_64-pc-linux-gnu
+++ b/env.d/04gcc-x86_64-pc-linux-gnu
@@ -1,6 +1,6 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"
+PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0"
+ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0"
 GCC_SPECS=""
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/info"
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info"
 MULTIOSDIRS="../lib64:../lib32"

diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE
index 3dd5bac216a1c0dfb004052e2f9c84d4cd7bdfd2..b56082603186017940c3a07d966547e73f0af8a3 120000 (symlink)
--- a/env.d/gcc/.NATIVE
+++ b/env.d/gcc/.NATIVE
@@ -1 +1 @@
-x86_64-pc-linux-gnu-4.9.4
\ No newline at end of file
+x86_64-pc-linux-gnu-5.4.0
\ No newline at end of file

diff --git a/env.d/gcc/config-x86_64-pc-linux-gnu b/env.d/gcc/config-x86_64-pc-linux-gnu
index 96c761e19fa1f7e53db34a5cbac9b2a82929c2e2..99c1ceacf45d3f499e24a576e2acbc49d0021d36 100644 (file)
--- a/env.d/gcc/config-x86_64-pc-linux-gnu
+++ b/env.d/gcc/config-x86_64-pc-linux-gnu
@@ -1 +1 @@
-CURRENT=x86_64-pc-linux-gnu-4.9.4
+CURRENT=x86_64-pc-linux-gnu-5.4.0

diff --git a/env.d/gcc/x86_64-pc-linux-gnu-5.4.0 b/env.d/gcc/x86_64-pc-linux-gnu-5.4.0
index 72fbfdfdad35b764e64aec65c170516c3cad4256..c29225165d6faa2c3943ed5ad5c4004180eb9eef 100644 (file)
--- a/env.d/gcc/x86_64-pc-linux-gnu-5.4.0
+++ b/env.d/gcc/x86_64-pc-linux-gnu-5.4.0
@@ -1,6 +1,3 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0"
-GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0"
 LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/5.4.0:/usr/lib/gcc/x86_64-pc-linux-gnu/5.4.0/32"
 MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man"
 INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info"
@@ -8,3 +5,4 @@ STDCXX_INCDIR="g++-v5"
 CTARGET="x86_64-pc-linux-gnu"
 GCC_SPECS=""
 MULTIOSDIRS="../lib64:../lib32"
+GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0"

diff --git a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
index 56c47e2f509c997b71ea646e028d592ddaab4f06..dd16f64b7302b8c1561cccb5839bd33a6668d261 100644 (file)
--- a/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
+++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
@@ -1,6 +1,2 @@
 /usr/lib/gcc/x86_64-pc-linux-gnu/5.4.0/32
 /usr/lib/gcc/x86_64-pc-linux-gnu/5.4.0
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4/32
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3/32
-/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.3

diff --git a/profile.env b/profile.env
index b170a25fa7fb643b49ed03ba4e38d1c9fefc99db..e610b4d608819bf28cd623f9a9c84d54e506c977 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -8,17 +8,17 @@ export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5
 export EDITOR='/usr/bin/vim'
 export GCC_SPECS=''
 export GUILE_LOAD_PATH='/usr/share/guile/1.8'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/info'
+export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/info'
 export LADSPA_PATH='/usr/lib64/ladspa'
 export LESS='-R -M --shift 5'
 export LESSOPEN='|lesspipe %s'
-export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
+export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/5.4.0/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.26.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.6/man/:/usr/lib64/php7.0/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.5/man/'
 export MULTIOSDIRS='../lib64:../lib32'
 export OPENGL_PROFILE='xorg-x11'
 export PAGER='/usr/bin/less'
-export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin'
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
 export PYTHONDOCS='/usr/share/doc/python-docs-2.7.10/html/library'
 export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.10/html/library'
-export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/usr/lib64/subversion/bin'
 export XDG_CONFIG_DIRS='/etc/xdg'
 export XDG_DATA_DIRS='/usr/local/share:/usr/share'