saving uncommitted changes in /etc prior to emerge run

diff --git a/csh.env b/csh.env
index 26b7b4de64adf625506884148ff918d0417d1d31..04b3f9ff3e1398bccfac02fd90155d56de05ac26 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -9,17 +9,17 @@ setenv EDITOR '/usr/bin/vim'
 setenv GCC_SPECS ''
 setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
 setenv HG '/usr/bin/hg'
-setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'
+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.25.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.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/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/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/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.3:/usr/lib64/subversion/bin'
+setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/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.3:/usr/lib64/subversion/bin'
+setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/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 529faa97a670fea7a5510dd2ebcedb0a2395e2fa..e9f4b4d8d23f0f42fa3283b7371745bf5a9b65ff 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.3"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.3"
+PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"
+ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"
 GCC_SPECS=""
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info"
+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"
 MULTIOSDIRS="../lib64:../lib32"

diff --git a/env.d/gcc/.NATIVE b/env.d/gcc/.NATIVE
index 0967d73a863cae1be6dcc4fee33bd11eeac8ac9f..3dd5bac216a1c0dfb004052e2f9c84d4cd7bdfd2 120000 (symlink)
--- a/env.d/gcc/.NATIVE
+++ b/env.d/gcc/.NATIVE
@@ -1 +1 @@
-x86_64-pc-linux-gnu-4.9.3
\ No newline at end of file
+x86_64-pc-linux-gnu-4.9.4
\ 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 5ef56a33a669e993ed3ba5e46569655d55789808..96c761e19fa1f7e53db34a5cbac9b2a82929c2e2 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.3
+CURRENT=x86_64-pc-linux-gnu-4.9.4

diff --git a/env.d/gcc/x86_64-pc-linux-gnu-4.9.4 b/env.d/gcc/x86_64-pc-linux-gnu-4.9.4
index 5825209b19c651aa49f83ea9c612268c5962152f..13f465fb38eab329aa64ca191498d522538a3942 100644 (file)
--- a/env.d/gcc/x86_64-pc-linux-gnu-4.9.4
+++ b/env.d/gcc/x86_64-pc-linux-gnu-4.9.4
@@ -1,6 +1,3 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"
-GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"
 LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4:/usr/lib/gcc/x86_64-pc-linux-gnu/4.9.4/32"
 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"
@@ -8,3 +5,4 @@ STDCXX_INCDIR="g++-v4"
 CTARGET="x86_64-pc-linux-gnu"
 GCC_SPECS=""
 MULTIOSDIRS="../lib64:../lib32"
+GCC_PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4"

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 8bf4cbe048aff4dd5cad169562913522ba07953d..75c459a202daa38031d338b51f4338bfc73617ec 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,2 +1,4 @@
+/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 824621faa0307454a1d5be246ddad60c2e6a1c57..e8f94b7884f24af34ec390b2e6670943802f6b9c 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -9,17 +9,17 @@ export EDITOR='/usr/bin/vim'
 export GCC_SPECS=''
 export GUILE_LOAD_PATH='/usr/share/guile/1.8'
 export HG='/usr/bin/hg'
-export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'
+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.25.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.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/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/4.9.4/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/man:/etc/java-config-2/current-system-vm/man/:/usr/lib64/php5.5/man/:/usr/lib64/php5.6/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.3:/usr/lib64/subversion/bin'
+export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/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.3:/usr/lib64/subversion/bin'
+export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin'
 export XDG_CONFIG_DIRS='/etc/xdg'
 export XDG_DATA_DIRS='/usr/local/share:/usr/share'