saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 8f64d6314f4226530668f76c500dae521aad04a6..86932a7b853543f70682642baad9d7bfd7f584cf 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -773,8 +773,8 @@ maybe chmod 0644 './env.d/00basic'
 maybe chmod 0644 './env.d/00glibc'
 maybe chmod 0644 './env.d/02locale'
 maybe chmod 0644 './env.d/03opengl'
+maybe chmod 0644 './env.d/04gcc-x86_64-pc-linux-gnu'
 maybe chmod 0644 './env.d/05binutils'
-maybe chmod 0644 './env.d/05gcc-x86_64-pc-linux-gnu'
 maybe chmod 0644 './env.d/08xulrunner'
 maybe chmod 0644 './env.d/09sandbox'
 maybe chmod 0644 './env.d/10rubygems'

diff --git a/csh.env b/csh.env
index 61f2a703263b5a9db4246beffe6330fb4cdd38af..211fd758d52523468161fcd8868e8c08e3d37fe0 100644 (file)
--- 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 PATH '/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin:/usr/games/bin'
 setenv PRELINK_PATH_MASK '/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so'

diff --git a/env.d/04gcc-x86_64-pc-linux-gnu b/env.d/04gcc-x86_64-pc-linux-gnu
new file mode 100644 (file)
index 0000000..a74e5f7
--- /dev/null
+++ b/env.d/04gcc-x86_64-pc-linux-gnu
@@ -0,0 +1,5 @@
+PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
+ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
+GCC_SPECS=""
+MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man"
+INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info"

diff --git a/env.d/05gcc-x86_64-pc-linux-gnu b/env.d/05gcc-x86_64-pc-linux-gnu
deleted file mode 100644 (file)
index a74e5f7..0000000
--- a/env.d/05gcc-x86_64-pc-linux-gnu
+++ /dev/null
@@ -1,5 +0,0 @@
-PATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
-ROOTPATH="/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3"
-GCC_SPECS=""
-MANPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/man"
-INFOPATH="/usr/share/gcc-data/x86_64-pc-linux-gnu/4.5.3/info"

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 89bfd60bedd3b0bd340a96329572fb055868ad87..65c2b1f2047eefeeb8c491aa415b5681613d95d3 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,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 1125bf7dbacfcf87db00f93bbbe23baed64dceda..fd27962ae00893ad90794a02e1583473f17c5f32 100644 (file)
--- 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 PATH='/opt/bin:/usr/x86_64-pc-linux-gnu/gcc-bin/4.5.3:/usr/lib64/subversion/bin:/usr/games/bin'
 export PRELINK_PATH_MASK='/usr/lib64/libfreebl3.so:/usr/lib64/libnssdbm3.so:/usr/lib64/libsoftokn3.so'