From 57e2505b39a4f9e4f108f662a6b0cfa8e2f65381 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 28 Dec 2016 12:21:17 +0100 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-4.9.4 | 4 +--- ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf | 2 ++ profile.env | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/csh.env b/csh.env index 7c84698c..fb0a504b 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.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 LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' @@ -28,17 +28,17 @@ setenv LC_TIME 'de_DE.utf8' setenv LESS '-R -M --shift 5' setenv LESSOPEN '|lesspipe %s' setenv LIBBLURAY_CP '/usr/share/libbluray/lib/libbluray.jar' -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.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.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:/usr/games/bin' +setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin:/usr/games/bin' setenv PRELINK_PATH_MASK '/usr/bin/evolution:/opt/bin/skype' 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 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.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 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 529faa97..e9f4b4d8 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.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 0967d73a..3dd5bac2 120000 --- 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 5ef56a33..96c761e1 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.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 5825209b..13f465fb 100644 --- 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 8bf4cbe0..75c459a2 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,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 7563e7a6..ce14020a 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.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 LANG='de_DE.UTF-8' export LC_ADDRESS='de_DE.utf8' @@ -28,17 +28,17 @@ export LC_TIME='de_DE.utf8' export LESS='-R -M --shift 5' export LESSOPEN='|lesspipe %s' export LIBBLURAY_CP='/usr/share/libbluray/lib/libbluray.jar' -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.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.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:/usr/games/bin' +export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.4:/usr/lib64/subversion/bin:/usr/games/bin' export PRELINK_PATH_MASK='/usr/bin/evolution:/opt/bin/skype' 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 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.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 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