From 890e93f3627a7902a08348477a3f34ce1b8d5247 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 21 Apr 2017 20:42:20 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- csh.env | 8 ++++---- env.d/04gcc-x86_64-pc-linux-gnu | 8 ++++---- env.d/gcc/.NATIVE | 2 +- env.d/gcc/config-x86_64-pc-linux-gnu | 2 +- env.d/gcc/x86_64-pc-linux-gnu-5.4.0 | 4 +--- ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf | 2 -- profile.env | 8 ++++---- 7 files changed, 15 insertions(+), 19 deletions(-) diff --git a/csh.env b/csh.env index 5cd6d442..d1d78b7f 100644 --- a/csh.env +++ b/csh.env @@ -10,7 +10,7 @@ setenv FLTK_DOCDIR '/usr/share/doc/fltk-1.3.3-r3/html' setenv GCC_SPECS '' setenv GSETTINGS_BACKEND 'dconf' 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 LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' @@ -27,17 +27,17 @@ setenv LC_TELEPHONE 'de_DE.utf8' setenv LC_TIME 'de_DE.utf8' 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 MOZ_GMP_PATH '/usr/lib64/nsbrowser/plugins/gmp-gmpopenh264/system-installed' 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:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin' +setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin' setenv PRELINK_PATH_MASK '/usr/bin/evolution:/opt/bin/skype' setenv PYTHONDOCS_2_7 '/usr/share/doc/python-docs-2.7.10/html/library' setenv QT_GRAPHICSSYSTEM 'raster' setenv QT_PLUGIN_PATH '/usr/lib64/kde4/plugins' -setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/opt/stuffit/bin:/usr/lib64/subversion/bin' +setenv ROOTPATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin' setenv R_HOME '/usr/lib64/R' setenv XDG_CONFIG_DIRS '/etc/xdg' setenv XDG_DATA_DIRS '/usr/local/share:/usr/share:/usr/share/gdm' diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu index e9f4b4d8..9a2ddad0 100644 --- 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 3dd5bac2..b5608260 120000 --- 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 96c761e1..99c1ceac 100644 --- 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 72fbfdfd..c2922516 100644 --- 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 af2db12c..dd16f64b 100644 --- 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,4 +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 diff --git a/profile.env b/profile.env index 2c28895e..561e93f2 100644 --- a/profile.env +++ b/profile.env @@ -10,7 +10,7 @@ export FLTK_DOCDIR='/usr/share/doc/fltk-1.3.3-r3/html' export GCC_SPECS='' export GSETTINGS_BACKEND='dconf' 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 LANG='de_DE.UTF-8' export LC_ADDRESS='de_DE.utf8' @@ -27,17 +27,17 @@ export LC_TELEPHONE='de_DE.utf8' export LC_TIME='de_DE.utf8' 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 MOZ_GMP_PATH='/usr/lib64/nsbrowser/plugins/gmp-gmpopenh264/system-installed' 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:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin' +export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin:/usr/games/bin' export PRELINK_PATH_MASK='/usr/bin/evolution:/opt/bin/skype' export PYTHONDOCS_2_7='/usr/share/doc/python-docs-2.7.10/html/library' export QT_GRAPHICSSYSTEM='raster' export QT_PLUGIN_PATH='/usr/lib64/kde4/plugins' -export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/opt/stuffit/bin:/usr/lib64/subversion/bin' +export ROOTPATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/5.4.0:/opt/stuffit/bin:/usr/lib64/subversion/bin' export R_HOME='/usr/lib64/R' export XDG_CONFIG_DIRS='/etc/xdg' export XDG_DATA_DIRS='/usr/local/share:/usr/share:/usr/share/gdm' -- 2.39.5