saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index c3fa644a6312bbc2687088d0e82d698dd9a69047..604ac7dfb78b9c0d878a14bb035cc0c128216f75 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -803,6 +803,7 @@ maybe chmod 0644 './ld.so.cache'
 maybe chmod 0644 './ld.so.conf'
 maybe chmod 0755 './ld.so.conf.d'
 maybe chmod 0644 './ld.so.conf.d/05binutils.conf'
+maybe chmod 0644 './ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf'
 maybe chmod 0440 './ldap.conf.sudo'
 maybe chmod 0755 './lftp'
 maybe chmod 0644 './lftp/lftp.conf'

diff --git a/env.d/05gcc-x86_64-pc-linux-gnu b/env.d/05gcc-x86_64-pc-linux-gnu
index ff3514acaf432c6389dcb48a135a0e85d0803b51..a74e5f7475a9b7c4c3f0c8a7323ac611b38c6983 100644 (file)
--- a/env.d/05gcc-x86_64-pc-linux-gnu
+++ b/env.d/05gcc-x86_64-pc-linux-gnu
@@ -1,6 +1,5 @@
-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"
-LDPATH="/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3:/usr/lib/gcc/x86_64-pc-linux-gnu/4.5.3/32"
 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 b/ld.so.conf
index 6d3cc3f8e65efa144e0676956fd13b99490712c0..f1e7e222d48608c49e62a565e23f57d2d323c178 100644 (file)
--- a/ld.so.conf
+++ b/ld.so.conf
@@ -10,8 +10,6 @@ include ld.so.conf.d/*.conf
 /usr/local/lib32
 /lib
 /usr/lib
-/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/postgresql
 /usr/lib64/postgresql
 /usr/lib64/postgresql-9.1/lib64/

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
new file mode 100644 (file)
index 0000000..89bfd60
--- /dev/null
+++ b/ld.so.conf.d/05gcc-x86_64-pc-linux-gnu.conf
@@ -0,0 +1,4 @@
+/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