From eb5f02c5542f5f8b39ec2e1daf3134745ace2e8f Mon Sep 17 00:00:00 2001 From: frank Date: Wed, 6 Jun 2012 23:14:57 +0200 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- csh.env | 4 ++-- .../{05gcc-x86_64-pc-linux-gnu => 04gcc-x86_64-pc-linux-gnu} | 0 ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf | 2 -- profile.env | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) rename env.d/{05gcc-x86_64-pc-linux-gnu => 04gcc-x86_64-pc-linux-gnu} (100%) diff --git a/csh.env b/csh.env index d3218373..1a425438 100644 --- a/csh.env +++ b/csh.env @@ -11,7 +11,7 @@ setenv GCC_SPECS '' setenv GDK_USE_XFT '1' setenv GSETTINGS_BACKEND 'dconf' setenv HG '/usr/bin/hg' -setenv INFOPATH '/usr/share/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info' +setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info' setenv JAVACC_HOME '/usr/share/javacc/' setenv LANG 'de_DE.UTF-8' setenv LC_ADDRESS 'de_DE.utf8' @@ -29,7 +29,7 @@ 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/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' +setenv MANPATH '/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' setenv OPENGL_PROFILE 'xorg-x11' setenv PAGER '/usr/bin/less' setenv PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin:/usr/games/bin' diff --git a/env.d/05gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu similarity index 100% rename from env.d/05gcc-x86_64-pc-linux-gnu rename to env.d/04gcc-x86_64-pc-linux-gnu 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 89bfd60b..65c2b1f2 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/4.5.3/32 /usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 -/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32 -/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3 diff --git a/profile.env b/profile.env index 89e2c359..2f42cd6f 100644 --- a/profile.env +++ b/profile.env @@ -11,7 +11,7 @@ export GCC_SPECS='' export GDK_USE_XFT='1' export GSETTINGS_BACKEND='dconf' export HG='/usr/bin/hg' -export INFOPATH='/usr/share/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info' +export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/info' export JAVACC_HOME='/usr/share/javacc/' export LANG='de_DE.UTF-8' export LC_ADDRESS='de_DE.utf8' @@ -29,7 +29,7 @@ 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/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' +export MANPATH='/usr/local/share/man:/usr/share/man:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.21.1/man:/etc/java-config/system-vm/man/:/usr/lib64/php5.3/man/:/usr/share/postgresql/man/:/usr/share/postgresql-9.1/man/' export OPENGL_PROFILE='xorg-x11' export PAGER='/usr/bin/less' export PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin:/usr/games/bin' -- 2.39.5